Run fish_indent on share/**.fish

share/functions/__fish_apropos.fish

@@ -9,7 +9,7 @@ end
 set -l sysver (uname -sr | string match -r "(Darwin) (\d\d)"\.)
 
 if test $status -eq 0 -a (count $sysver) -eq 3
-    and test $sysver[2] = 'Darwin' -a $sysver[3] -ge 19
+    and test $sysver[2] = Darwin -a $sysver[3] -ge 19
 
     set -l dir
     if test -n "$XDG_CACHE_HOME"

share/functions/__fish_is_token_n.fish

@@ -1,5 +1,3 @@
 function __fish_is_token_n --description 'Test if current token is on Nth place' --argument-names n
     fish_is_nth_token $n
 end
-
-

share/functions/__fish_make_completion_signals.fish

@@ -8,7 +8,7 @@ function __fish_make_completion_signals --description 'Make list of kill signals
     # Just hardcode the signals.
     set -l os (uname)
     if string match -q 'CYGWIN*' -- $os
-        or string match -iq 'Msys' -- $os
+        or string match -iq Msys -- $os
         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" \

share/functions/fish_command_not_found.fish

@@ -61,18 +61,18 @@ else if type -q pkgfile
             __fish_default_command_not_found_handler $argv[1]
         end
     end
-# pacman is too slow, see #7841.
-# else if type -q pacman
-#     function fish_command_not_found
-#         set -l paths $argv[1]
-#         # If we've not been given an absolute path, try $PATH as the starting point,
-#         # otherwise pacman will try *every path*, and e.g. bash-completion
-#         # isn't helpful.
-#         string match -q '/*' -- $argv[1]; or set paths $PATH/$argv[1]
-#         # Pacman only prints the path, so we still need to print the error.
-#         __fish_default_command_not_found_handler $argv[1]
-#         pacman -F $paths
-#     end
+    # pacman is too slow, see #7841.
+    # else if type -q pacman
+    #     function fish_command_not_found
+    #         set -l paths $argv[1]
+    #         # If we've not been given an absolute path, try $PATH as the starting point,
+    #         # otherwise pacman will try *every path*, and e.g. bash-completion
+    #         # isn't helpful.
+    #         string match -q '/*' -- $argv[1]; or set paths $PATH/$argv[1]
+    #         # Pacman only prints the path, so we still need to print the error.
+    #         __fish_default_command_not_found_handler $argv[1]
+    #         pacman -F $paths
+    #     end
 else
     # Use standard fish command not found handler otherwise
     function fish_command_not_found --on-event fish_command_not_found

share/functions/fish_config.fish

@@ -248,7 +248,7 @@ function fish_config --description "Launch fish's web based configuration"
                         # permanently remove the globals.
                         set $scope $toks
                         set have_color 1
-                    end < $file
+                    end <$file
 
                     # Return true if we changed at least one color
                     test $have_color -eq 1