diff --git a/share/completions/adb.fish b/share/completions/adb.fish
index c3de96929..edb93c3b7 100644
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -157,7 +157,7 @@ complete -n '__fish_seen_subcommand_from forward' -c adb -l remove -d 'Remove a
 complete -n '__fish_seen_subcommand_from forward' -c adb -l remove-all -d 'Remove all forward socket connections'
 
 # sideload
-complete -n '__fish_seen_subcommand_from sideload' -c adb -xa '(__fish_complete_suffix .zip)'
+complete -n '__fish_seen_subcommand_from sideload' -c adb -k -xa '(__fish_complete_suffix .zip)'
 
 # reconnect
 complete -n '__fish_seen_subcommand_from reconnect' -c adb -x -a device -d 'Kick current connection from device side and make it reconnect.'
diff --git a/share/completions/asciidoctor.fish b/share/completions/asciidoctor.fish
index f21eea9dc..ea1306e24 100644
--- a/share/completions/asciidoctor.fish
+++ b/share/completions/asciidoctor.fish
@@ -1,4 +1,4 @@
-complete -x -c asciidoctor -a "
+complete -x -c asciidoctor -k -a "
 (
     __fish_complete_suffix .asciidoc
     __fish_complete_suffix .adoc
diff --git a/share/completions/at.fish b/share/completions/at.fish
index d6a0f6120..eadc955d8 100644
--- a/share/completions/at.fish
+++ b/share/completions/at.fish
@@ -2,7 +2,7 @@
 complete -f -c at -s V -d "Display version and exit"
 complete -f -c at -s q -d "Use specified queue"
 complete -f -c at -s m -d "Send mail to user"
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d "Read job from file"
+complete -c at -s f -k -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d "Read job from file"
 complete -f -c at -s l -d "Alias for atq"
 complete -f -c at -s d -d "Alias for atrm"
 complete -f -c at -s v -d "Show the time"
diff --git a/share/completions/aura.fish b/share/completions/aura.fish
index b74358787..fb0ac40a7 100644
--- a/share/completions/aura.fish
+++ b/share/completions/aura.fish
@@ -163,6 +163,6 @@ complete -c aura -n $sync -s y -l refresh -d 'Download fresh copy of the package
 complete -c aura -n "$sync; and $argument" -xa "$listall $listgroups"
 
 # Upgrade options
-complete -c aura -n "$upgrade; and $argument" -xa '(__fish_complete_suffix pkg.tar.xz)' -d 'Package file'
-complete -c aura -n "$upgrade; and $argument" -xa '(__fish_complete_suffix pkg.tar.gz)' -d 'Package file'
-complete -c aura -n "$upgrade; and $argument" -xa '(__fish_complete_suffix pkg.tar.zst)' -d 'Package file'
+complete -c aura -n "$upgrade; and $argument" -k -xa '(__fish_complete_suffix pkg.tar.xz)' -d 'Package file'
+complete -c aura -n "$upgrade; and $argument" -k -xa '(__fish_complete_suffix pkg.tar.gz)' -d 'Package file'
+complete -c aura -n "$upgrade; and $argument" -k -xa '(__fish_complete_suffix pkg.tar.zst)' -d 'Package file'
diff --git a/share/completions/bunzip2.fish b/share/completions/bunzip2.fish
index 9700d7f0b..b93c14484 100644
--- a/share/completions/bunzip2.fish
+++ b/share/completions/bunzip2.fish
@@ -1,10 +1,10 @@
-complete -c bunzip2 -x -a "(
+complete -c bunzip2 -k -x -a "(
 	__fish_complete_suffix .tbz
 	__fish_complete_suffix .tbz2
 )
 "
 
-complete -c bunzip2 -x -a "(
+complete -c bunzip2 -k -x -a "(
 	__fish_complete_suffix .bz
 	__fish_complete_suffix .bz2
 )
diff --git a/share/completions/bzcat.fish b/share/completions/bzcat.fish
index f3181206e..5151070bf 100644
--- a/share/completions/bzcat.fish
+++ b/share/completions/bzcat.fish
@@ -1,10 +1,10 @@
-complete -c bzcat -x -a "(
+complete -c bzcat -k -x -a "(
 	__fish_complete_suffix .tbz
 	__fish_complete_suffix .tbz2
 )
 "
 
-complete -c bzcat -x -a "(
+complete -c bzcat -k -x -a "(
 	__fish_complete_suffix .bz
 	__fish_complete_suffix .bz2
 )
diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish
index f9d33b294..75af712ee 100644
--- a/share/completions/bzip2.fish
+++ b/share/completions/bzip2.fish
@@ -1,11 +1,11 @@
 complete -c bzip2 -s c -l stdout -d "Compress to stdout"
-complete -c bzip2 -s d -l decompress -x -a "(
+complete -c bzip2 -s d -l decompress -k -x -a "(
 	__fish_complete_suffix .tbz
 	__fish_complete_suffix .tbz2
 )
 "
 
-complete -c bzip2 -s d -l decompress -x -a "(
+complete -c bzip2 -s d -l decompress -k -x -a "(
 	__fish_complete_suffix .bz
 	__fish_complete_suffix .bz2
 )
diff --git a/share/completions/bzip2recover.fish b/share/completions/bzip2recover.fish
index 3f77afb71..1f469c064 100644
--- a/share/completions/bzip2recover.fish
+++ b/share/completions/bzip2recover.fish
@@ -1,10 +1,10 @@
-complete -c bzip2recover -x -a "(
+complete -c bzip2recover -k -x -a "(
 	__fish_complete_suffix .tbz
 	__fish_complete_suffix .tbz2
 )
 "
 
-complete -c bzip2recover -x -a "(
+complete -c bzip2recover -k -x -a "(
 	__fish_complete_suffix .bz
 	__fish_complete_suffix .bz2
 )
diff --git a/share/completions/castnow.fish b/share/completions/castnow.fish
index 6788b1c95..949376055 100644
--- a/share/completions/castnow.fish
+++ b/share/completions/castnow.fish
@@ -6,7 +6,7 @@ set -l __fish_castnow_keys "space\tToggle\ between\ play\ and\ pause m\tToggle\
 complete -c castnow -l tomp4 -d "Convert file to mp4 during playback"
 complete -c castnow -l device -d "Specify name of Chromecast device to be used" -x
 complete -c castnow -l address -d "Specify IP or hostname of Chromecast device" -x
-complete -c castnow -l subtitles -d "Path or URL to SRT or VTT file" -x -a "(
+complete -c castnow -l subtitles -d "Path or URL to SRT or VTT file" -k -x -a "(
     __fish_complete_suffix .srt
     __fish_complete_suffix .vtt
 )"
diff --git a/share/completions/clang++.fish b/share/completions/clang++.fish
index b4c4572d7..7a1350020 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_complete_clang)'
 complete -p '*clang++*' -n 'not __fish_should_complete_switches' \
-    -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)"
+    -k -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 3a18cc05d..d937f8251 100644
--- a/share/completions/clang.fish
+++ b/share/completions/clang.fish
@@ -5,8 +5,8 @@
 # This pattern unfortunately matches clang-format, etc. as well.
 complete -p '*clang*' -n __fish_should_complete_switches -xa '(__fish_complete_clang)'
 complete -c clang -n 'not __fish_should_complete_switches' \
-    -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)"
+    -k -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; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
+    -k -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/cmark.fish b/share/completions/cmark.fish
index 4134bd8c7..6ed275fa7 100644
--- a/share/completions/cmark.fish
+++ b/share/completions/cmark.fish
@@ -1,4 +1,4 @@
-complete -x -c cmark -a "
+complete -k -x -c cmark -a "
 (
     __fish_complete_suffix .md
     __fish_complete_suffix .markdown
diff --git a/share/completions/curl.fish b/share/completions/curl.fish
index 5f10e9c04..ba01448f0 100644
--- a/share/completions/curl.fish
+++ b/share/completions/curl.fish
@@ -1,4 +1,4 @@
-complete -c curl -n 'string match -qr "^@" -- (commandline -ct)' -xa "(printf '%s\n' -- @(__fish_complete_suffix (commandline -ct | string replace -r '^@' '') ''))"
+complete -c curl -n 'string match -qr "^@" -- (commandline -ct)' -k -xa "(printf '%s\n' -- @(__fish_complete_suffix (commandline -ct | string replace -r '^@' '') ''))"
 
 # These based on the autogenerated completions.
 complete -c curl -l abstract-unix-socket -d '(HTTP) Connect through an abstract Unix domain socket, instead of using the n…'
diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
index 9bd27896b..fec79505d 100644
--- a/share/completions/cwebp.fish
+++ b/share/completions/cwebp.fish
@@ -120,7 +120,7 @@ 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 -r -o d -k -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'
@@ -143,4 +143,4 @@ 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'
+complete -c cwebp -r -o o -k -a '(__fish_complete_suffix .webp)' -d 'Output to file'
diff --git a/share/completions/djview.fish b/share/completions/djview.fish
index e88db8eae..3e426f84e 100644
--- a/share/completions/djview.fish
+++ b/share/completions/djview.fish
@@ -1,2 +1,2 @@
 
-complete -c djview -x -a "(__fish_complete_suffix .djvu)"
+complete -c djview -x -k -a "(__fish_complete_suffix .djvu)"
diff --git a/share/completions/djview4.fish b/share/completions/djview4.fish
index 91d3054be..ce08c99bf 100644
--- a/share/completions/djview4.fish
+++ b/share/completions/djview4.fish
@@ -1,2 +1,2 @@
 
-complete -c djview4 -x -a "(__fish_complete_suffix .djvu)"
+complete -c djview4 -x -k -a "(__fish_complete_suffix .djvu)"
diff --git a/share/completions/dpkg.fish b/share/completions/dpkg.fish
index 857085d21..2e185554d 100644
--- a/share/completions/dpkg.fish
+++ b/share/completions/dpkg.fish
@@ -1,6 +1,6 @@
 
-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 -s i -l install -d 'Install .deb package' -k -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -l unpack -d 'Unpack .deb package' -k -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\')'
@@ -9,8 +9,8 @@ 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 c -l contents -d 'List contents of .deb' -k -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -s I -l info -d 'Show .deb information' -k -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\')'
diff --git a/share/completions/dvipdf.fish b/share/completions/dvipdf.fish
index 300bb8116..1156560ec 100644
--- a/share/completions/dvipdf.fish
+++ b/share/completions/dvipdf.fish
@@ -1,3 +1,3 @@
-complete -c dvipdf -x -a "(
+complete -c dvipdf -k -x -a "(
            __fish_complete_suffix .dvi
    )"
diff --git a/share/completions/dvipdfm.fish b/share/completions/dvipdfm.fish
index 94f6668cd..d3631a28d 100644
--- a/share/completions/dvipdfm.fish
+++ b/share/completions/dvipdfm.fish
@@ -1,4 +1,4 @@
-complete -c dvipdfm -x -a "
+complete -c dvipdfm -k -x -a "
 (
            __fish_complete_suffix .dvi
 )"
diff --git a/share/completions/figlet.fish b/share/completions/figlet.fish
index 70870c7b0..159ced383 100644
--- a/share/completions/figlet.fish
+++ b/share/completions/figlet.fish
@@ -17,7 +17,7 @@ complete -c figlet -s p -d "Put FIGlet into `paragraph mode`"
 complete -c figlet -s n -d "Put FIGlet back to normal"
 complete -c figlet -s D -d "Switch to German (ISO 646-DE) character set"
 complete -c figlet -s E -d "Turns off German character set processing"
-complete -c figlet -s C -d "Add given control file" -a "(__fish_complete_suffix .flc)" -x
+complete -c figlet -s C -d "Add given control file" -k -a "(__fish_complete_suffix .flc)" -x
 complete -c figlet -s N -d "Clear control file list"
 complete -c figlet -s s -d "Cause `smushing`"
 complete -c figlet -s S -d "Cause `smushing`"
diff --git a/share/completions/fish.fish b/share/completions/fish.fish
index 44d26b30f..63c55536f 100644
--- a/share/completions/fish.fish
+++ b/share/completions/fish.fish
@@ -20,4 +20,4 @@ complete -c fish -s f -l features -d "Run with comma-separated feature flags ena
 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)"
+complete -c fish -k -x -a "(__fish_complete_suffix .fish)"
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 4b1b37520..14ab29b24 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1708,6 +1708,7 @@ complete -f -c git -n __fish_git_needs_command -a config -d 'Set and read git co
 ### format-patch
 complete -f -c git -n __fish_git_needs_command -a format-patch -d 'Generate patch series to send upstream'
 complete -f -c git -n '__fish_git_using_command format-patch' -a '(__fish_git_branches)'
+complete -c git -n '__fish_git_using_command format-patch' -s o -l output-directory -xa '(__fish_complete_directories)'
 complete -f -c git -n '__fish_git_using_command format-patch' -s p -l no-stat -d "Generate plain patches without diffstat"
 complete -f -c git -n '__fish_git_using_command format-patch' -s s -l no-patch -d "Suppress diff output"
 complete -f -c git -n '__fish_git_using_command format-patch' -l minimal -d "Spend more time to create smaller diffs"
diff --git a/share/completions/go.fish b/share/completions/go.fish
index fa01fd910..d79f8b7e3 100644
--- a/share/completions/go.fish
+++ b/share/completions/go.fish
@@ -30,7 +30,7 @@ complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o mod -
 
 
 # Completions for go cmds that takes file arguments
-complete -c go -n "__fish_seen_subcommand_from build compile fix fmt install test vet" -x -a "(
+complete -c go -n "__fish_seen_subcommand_from build compile fix fmt install test vet" -k -x -a "(
             __fish_complete_suffix .go
     )" --description File
 
diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish
index 7ec611032..53eeb21b8 100644
--- a/share/completions/gunzip.fish
+++ b/share/completions/gunzip.fish
@@ -1,5 +1,5 @@
 complete -c gunzip -s c -l stdout -d "Compress to stdout"
-complete -c gunzip -x -a "(
+complete -c gunzip -k -x -a "(
 	__fish_complete_suffix .gz
 	__fish_complete_suffix .tgz
 )
diff --git a/share/completions/gv.fish b/share/completions/gv.fish
index 1043ba4fa..6de7ac2aa 100644
--- a/share/completions/gv.fish
+++ b/share/completions/gv.fish
@@ -1,7 +1,7 @@
-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 -k -xa "(__fish_complete_suffix .ps)"
+complete -c gv -k -xa "(__fish_complete_suffix .ps.gz)"
+complete -c gv -k -xa "(__fish_complete_suffix .eps)"
+complete -c gv -k -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'
diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish
index fe6e92678..ebbb0c6e8 100644
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -1,5 +1,5 @@
 complete -c gzip -s c -l stdout -d "Compress to stdout"
-complete -c gzip -s d -l decompress -x -a "
+complete -c gzip -s d -l decompress -k -x -a "
 (
 	__fish_complete_suffix .gz
 	__fish_complete_suffix .tgz
diff --git a/share/completions/latexmk.fish b/share/completions/latexmk.fish
index 1831a43ca..ac1dc5eeb 100644
--- a/share/completions/latexmk.fish
+++ b/share/completions/latexmk.fish
@@ -1,4 +1,4 @@
-complete -c latexmk -x -a "(__fish_complete_suffix (commandline -ct) .tex '(La)TeX file')"
+complete -c latexmk -k -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-cond -d 'use bibtex when needed, but only if the bib files exist'
diff --git a/share/completions/lp.fish b/share/completions/lp.fish
index 0945de61c..c0a3d470c 100644
--- a/share/completions/lp.fish
+++ b/share/completions/lp.fish
@@ -1,6 +1,6 @@
 __fish_complete_lpr lp
-complete -c lpr -xa "(__fish_complete_suffix .pdf)"
-complete -c lpr -xa "(__fish_complete_suffix .ps)"
+complete -c lpr -k -xa "(__fish_complete_suffix .pdf)"
+complete -c lpr -k -xa "(__fish_complete_suffix .ps)"
 complete -c lp -s d -d 'Prints files to the named printer' -xa '(__fish_print_lpr_printers)'
 complete -c lp -s i -d 'Specifies an existing job to modify' -x
 complete -c lp -s n -d 'Sets the number of copies to print from 1 to 100' -x
diff --git a/share/completions/lpadmin.fish b/share/completions/lpadmin.fish
index 171d9c50e..6e9d83c52 100644
--- a/share/completions/lpadmin.fish
+++ b/share/completions/lpadmin.fish
@@ -8,7 +8,7 @@ complete -c lpadmin -s v -d 'Sets the device-uri attribute of the printer queue'
 complete -c lpadmin -s D -d 'Provides a textual description of the destination' -x
 complete -c lpadmin -s E -d 'Enables the destination and accepts jobs'
 complete -c lpadmin -s L -d 'Provides a textual location of the destination' -x
-complete -c lpadmin -s P -d 'Specifies a PostScript Printer Description file to use with the printer' -xa "(__fish_complete_suffix .ppd; __fish_complete_suffix .ppd.gz)"
+complete -c lpadmin -s P -d 'Specifies a PostScript Printer Description file to use with the printer' -k -xa "(__fish_complete_suffix .ppd; __fish_complete_suffix .ppd.gz)"
 complete -c lpadmin -s o -xa cupsIPPSupplies=true -d 'Specifies whether IPP supply level values should be reported'
 complete -c lpadmin -s o -xa cupsIPPSupplies=false -d 'Specifies whether IPP supply level values should be reported'
 complete -c lpadmin -s o -xa cupsSNMPSupplies=true -d 'Specifies whether SNMP supply level (RFC 3805) values should be reported'
diff --git a/share/completions/lpr.fish b/share/completions/lpr.fish
index 911266fad..b482e12ed 100644
--- a/share/completions/lpr.fish
+++ b/share/completions/lpr.fish
@@ -1,6 +1,6 @@
 __fish_complete_lpr lpr
-complete -c lpr -xa "(__fish_complete_suffix .pdf)"
-complete -c lpr -xa "(__fish_complete_suffix .ps)"
+complete -c lpr -k -xa "(__fish_complete_suffix .pdf)"
+complete -c lpr -k -xa "(__fish_complete_suffix .ps)"
 complete -c lpr -s H -x -d 'Specifies an alternate server' -xa '(__fish_print_hostnames)'
 complete -c lpr -s C -s J -s T -x -d 'Sets the job name'
 #complete -c lpr -o '\\#' -d 'Sets the number of copies to print from 1 to 100' -xa
diff --git a/share/completions/lua.fish b/share/completions/lua.fish
index 1edb4de64..2dd4dfba0 100644
--- a/share/completions/lua.fish
+++ b/share/completions/lua.fish
@@ -5,5 +5,5 @@ complete -c lua -s l -d 'Require library' -xa "(find /usr/lib{,32,64}/lua/ -name
 complete -c lua -s i -d 'Enter interactive mode after executing script'
 complete -c lua -s v -d 'Show version'
 complete -c lua -s h -l help -d 'Print help and exit'
-complete -c lua -a "(__fish_complete_suffix .lua)"
+complete -c lua -k -a "(__fish_complete_suffix .lua)"
 complete -c lua -a - -d 'Execute stdin and stop handling options'
diff --git a/share/completions/lz4.fish b/share/completions/lz4.fish
index de2dc221c..75bbf34dc 100644
--- a/share/completions/lz4.fish
+++ b/share/completions/lz4.fish
@@ -1,7 +1,7 @@
 # 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 "
+complete -c lz4 -s d -l decompress -l uncompress -d Decompress -k -x -a "
 (
     __fish_complete_suffix .lz4
 )
diff --git a/share/completions/lz4cat.fish b/share/completions/lz4cat.fish
index 240b0e367..ab1610aa6 100644
--- a/share/completions/lz4cat.fish
+++ b/share/completions/lz4cat.fish
@@ -1,6 +1,6 @@
 # Completions for lz4cat
 
-complete -c lz4cat -x -a "
+complete -c lz4cat -k -x -a "
 (
     __fish_complete_suffix .lz4
 )
diff --git a/share/completions/mupdf.fish b/share/completions/mupdf.fish
index fb5e346ff..bd36867c4 100644
--- a/share/completions/mupdf.fish
+++ b/share/completions/mupdf.fish
@@ -1,4 +1,4 @@
-complete -c mupdf -x -a "(__fish_complete_suffix .pdf)"
+complete -c mupdf -k -x -a "(__fish_complete_suffix .pdf)"
 
 complete -c mupdf -s p -d Description
 complete -c mupdf -s r -d Resolution
diff --git a/share/completions/ninja.fish b/share/completions/ninja.fish
index 706627deb..8686354db 100644
--- a/share/completions/ninja.fish
+++ b/share/completions/ninja.fish
@@ -17,7 +17,7 @@ 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"
-complete -c ninja -s f -x -a "(__fish_complete_suffix .ninja)" -d "specify build file [default=build.ninja]"
+complete -c ninja -s f -k -x -a "(__fish_complete_suffix .ninja)" -d "specify build file [default=build.ninja]"
 complete -f -c ninja -s n -d "dry run"
 complete -f -c ninja -s v -d "show all command lines while building"
 complete -f -c ninja -s j -d "number of jobs to run in parallel [default derived from CPUs]"
diff --git a/share/completions/openocd.fish b/share/completions/openocd.fish
index 3e4e614e5..4e1eff35a 100644
--- a/share/completions/openocd.fish
+++ b/share/completions/openocd.fish
@@ -19,7 +19,7 @@ end
 complete -c openocd -f # at no point does openocd take arbitrary arguments
 complete -c openocd -s h -l help -d "display help"
 complete -c openocd -s v -l version -d "display version info"
-complete -c openocd -s f -l file -xa '(__fish_complete_openocd_path .cfg)'
+complete -c openocd -s f -l file -k -xa '(__fish_complete_openocd_path .cfg)'
 complete -c openocd -s d -l debug -d "run under debug level 3"
 complete -c openocd -s d -l debug -d "run under debug level n" -xa '(seq 1 9)'
 complete -c openocd -s l -l log_output -d "redirect output to file" -r
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index c036e14c0..ff2b72451 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -37,6 +37,6 @@ complete -x -c optipng -n __fish_should_complete_switches -a '-dir\t"write outpu
 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;  __fish_complete_suffix .pnm;  __fish_complete_suffix .tiff;  __fish_complete_suffix .bmp)'
+    -k -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 f1a0710c7..6eebfd7d7 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -159,4 +159,4 @@ 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 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'
+complete -c $progname -n "$upgrade" -k -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 20c51da5f..0364bf4ee 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -141,4 +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, tar.zst, or just pkg.tar (uncompressed pkg)
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz; __fish_complete_suffix pkg.tar;)' -d 'Package file'
+complete -c $progname -n "$upgrade" -k -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz; __fish_complete_suffix pkg.tar;)' -d 'Package file'
diff --git a/share/completions/pandoc.fish b/share/completions/pandoc.fish
index d0efa54b8..40d926af5 100644
--- a/share/completions/pandoc.fish
+++ b/share/completions/pandoc.fish
@@ -80,22 +80,22 @@ 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 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 print-highlight-style -k -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l highlight_style -k -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l csl -k -a "(__fish_complete_suffix 'csl'   )"
+complete -c pandoc -r -f -l reference-file -k -a "(__fish_complete_suffix 'odt') (__fish_complete_suffix 'docx')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'bib')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'bibtex')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'copac')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'json')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'yaml')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'enl')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'xml')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'wos')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'medline')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'mods')"
+complete -c pandoc -r -f -l bibliography -k -a "(__fish_complete_suffix 'ria')"
+complete -c pandoc -r -f -l lua-filter -k -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/' '')"
diff --git a/share/completions/patch.fish b/share/completions/patch.fish
index 4fd098c03..dbabb0e0e 100644
--- a/share/completions/patch.fish
+++ b/share/completions/patch.fish
@@ -17,7 +17,7 @@ complete -c patch -s f -l force -d "Like -t, but ignore bad-Prereq patches, assu
 complete -c patch -s F -l fuzz -x -d "Number of LINES for inexact 'fuzzy' matching" -a "(seq 0 9){\tfuzz lines}"
 complete -c patch -s g -l get -x -d "Get files from RCS etc. if positive; ask if negative" -a '(seq -1 1){\t\n}'
 complete -c patch -l help -f -d "Display help"
-complete -c patch -s i -l input -x -d "Read patch from FILE instead of stdin" -a "( __fish_complete_suffix .patch; __fish_complete_suffix .diff)"
+complete -c patch -s i -l input -x -d "Read patch from FILE instead of stdin" -k -a "( __fish_complete_suffix .patch; __fish_complete_suffix .diff)"
 complete -c patch -s l -l ignore-whitespace -d "Ignore whitespace changes between patch & input"
 complete -c patch -s n -l normal -d "Interpret patch as normal diff"
 complete -c patch -s N -l forward -d "Ignore patches that seem reversed or already applied"
diff --git a/share/completions/phpunit.fish b/share/completions/phpunit.fish
index 8cd039fd3..b349d4dc5 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; __fish_complete_suffix .xml.dist)' -d 'Read configuration from XML file'
+complete -x -c phpunit -s c -l configuration -k -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/ps2pdf.fish b/share/completions/ps2pdf.fish
index 036b0c1dd..a240ab74a 100644
--- a/share/completions/ps2pdf.fish
+++ b/share/completions/ps2pdf.fish
@@ -1,3 +1,3 @@
-complete -c ps2pdf -x -a "(
+complete -c ps2pdf -k -x -a "(
            __fish_complete_suffix .ps
    )"
diff --git a/share/completions/python.fish b/share/completions/python.fish
index 8a7710fcf..17d694892 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -16,7 +16,7 @@ complete -c python -o vv -d "Even more verbose mode"
 complete -c python -s V -l version -d "Display version and exit"
 complete -c python -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python -f -n __fish_is_first_token -a "(__fish_complete_suffix .py)"
+complete -c python -f -n __fish_is_first_token -k -a "(__fish_complete_suffix .py)"
 complete -c python -f -n __fish_is_first_token -a - -d 'Read program from stdin'
 
 # Version-specific completions
diff --git a/share/completions/python2.fish b/share/completions/python2.fish
index 76dff0340..82cd6a974 100644
--- a/share/completions/python2.fish
+++ b/share/completions/python2.fish
@@ -13,7 +13,7 @@ complete -c python2 -s v -d "Verbose mode"
 complete -c python2 -s V -d "Display version and exit"
 complete -c python2 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python2 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python2 -f -n __fish_is_first_token -a "(__fish_complete_suffix .py)"
+complete -c python2 -f -n __fish_is_first_token -k -a "(__fish_complete_suffix .py)"
 complete -c python2 -f -n __fish_is_first_token -a - -d 'Read program from stdin'
 complete -c python2 -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
 complete -c python2 -s t -d "Warn on mixed tabs and spaces"
diff --git a/share/completions/python3.fish b/share/completions/python3.fish
index c66d97697..0cac6485a 100644
--- a/share/completions/python3.fish
+++ b/share/completions/python3.fish
@@ -13,7 +13,7 @@ complete -c python3 -s v -d "Verbose mode"
 complete -c python3 -s V -l version -d "Display version and exit"
 complete -c python3 -s W -x -d "Warning control" -a "ignore default all module once error"
 complete -c python3 -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
-complete -c python3 -n __fish_is_first_token -fa "(__fish_complete_suffix .py)"
+complete -c python3 -n __fish_is_first_token -k -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' -a 'faulthandler showrefcount tracemalloc showalloccount importtime dev utf8 pycache_prefex=PATH:'
diff --git a/share/completions/pzstd.fish b/share/completions/pzstd.fish
index 5544b95db..e238f4f23 100644
--- a/share/completions/pzstd.fish
+++ b/share/completions/pzstd.fish
@@ -1,6 +1,6 @@
 # Completions for pzstd
 
-complete -c pzstd -s d -l decompress -d Decompress -x -a "
+complete -c pzstd -s d -l decompress -d Decompress -k -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/root.fish b/share/completions/root.fish
index 2988b8a27..0663ee522 100644
--- a/share/completions/root.fish
+++ b/share/completions/root.fish
@@ -7,4 +7,4 @@ complete -c root -s x -d 'Exit on exception'
 complete -c root -s h -s \? -l help -d 'Print help'
 complete -c root -o config -d 'Print ./configure options'
 complete -c root -o memstat -d 'Run with memory usage monitoring'
-complete -c root -a "(__fish_complete_suffix .root)"
+complete -c root -k -a "(__fish_complete_suffix .root)"
diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish
index 9bb26c6ee..e85a33459 100644
--- a/share/completions/rpm.fish
+++ b/share/completions/rpm.fish
@@ -77,9 +77,9 @@ 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
-complete $rpm_select -s p -l package -d 'Query an (uninstalled) package in specified file' -xa "(__fish_complete_suffix .rpm)"
+complete $rpm_select -s p -l package -d 'Query an (uninstalled) package in specified file' -k -xa "(__fish_complete_suffix .rpm)"
 complete $rpm_select -l pkgid -d 'Query package that contains a given package identifier, i.e. the MD5 digest of the combined header and payload contents' -x
-complete $rpm_select -l specfile -d 'Parse and query specified spec-file as if it were a package' -xa "(__fish_complete_suffix .spec)"
+complete $rpm_select -l specfile -d 'Parse and query specified spec-file as if it were a package' -k -xa "(__fish_complete_suffix .spec)"
 complete $rpm_select -l tid -d 'Query package(s) that have the specified TID (transaction identifier)' -x
 complete $rpm_select -l triggeredby -d 'Query packages that are triggered by the specified packages' -x -a "(__fish_print_rpm_packages)"
 complete $rpm_select -l whatprovides -d 'Query all packages that provide the specified capability' -x
@@ -121,4 +121,4 @@ complete $rpm_mode -s q -l query -d 'Query installed packages'
 complete $rpm_mode -s V -l verify -d 'Verify package integrity'
 complete $rpm_mode -s e -l erase -d 'Erase package'
 
-complete -c rpm -xa '(__fish_complete_suffix .rpm)'
+complete -c rpm -k -xa '(__fish_complete_suffix .rpm)'
diff --git a/share/completions/tex.fish b/share/completions/tex.fish
index c6c6b11a4..9597fc514 100644
--- a/share/completions/tex.fish
+++ b/share/completions/tex.fish
@@ -1,6 +1,6 @@
 complete -c tex -o help -d "Display help and exit"
 complete -c tex -o version -d "Display version and exit"
-complete -c tex -x -a "(
+complete -c tex -k -x -a "(
 __fish_complete_suffix (commandline -ct) .tex '(La)TeX file'
 )"
 
diff --git a/share/completions/ttx.fish b/share/completions/ttx.fish
index 4a0c2e86e..6a2780c23 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; __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)'
+complete -f -c ttx -k -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx; __fish_complete_suffix .ttc)'
+complete -c ttx -f -n __fish_is_first_token -k -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
 
 # General options
 complete -c ttx -f -s h -d'Show help message'
 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; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
+complete -c ttx -r -s o -d'Set output filename' -k -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'
@@ -31,11 +31,11 @@ complete -c ttx -f -s i -d'Do NOT disassemble TT instructions'
 complete -c ttx -x -s z -d'Use FORMAT for EBDT or CBDT' -a "$formats"
 complete -c ttx -f -s e -d'Don\'t ignore decompilation errors'
 complete -c ttx -x -s y -d'Select font index for TrueType Collection'
-complete -c ttx -x -l unicodedata -d'Custom database for character names [UnicodeData.txt]' -a '(__fish_complete_suffix .txt)'
+complete -c ttx -x -l unicodedata -d'Custom database for character names [UnicodeData.txt]' -k -a '(__fish_complete_suffix .txt)'
 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; __fish_complete_suffix .ttf)'
+complete -c ttx -x -s m -d'Merge named TTF/OTF with SINGLE .ttx input' -k -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/unlz4.fish b/share/completions/unlz4.fish
index a3abe6d07..1ff77de34 100644
--- a/share/completions/unlz4.fish
+++ b/share/completions/unlz4.fish
@@ -1,6 +1,6 @@
 # Completions for unlz4
 
-complete -c unlz4 -x -a "
+complete -c unlz4 -k -x -a "
 (
     __fish_complete_suffix .lz4
 )
diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish
index aa0fb52e9..a6da3eb5f 100644
--- a/share/completions/unzip.fish
+++ b/share/completions/unzip.fish
@@ -28,7 +28,7 @@ complete -c unzip -s M -d "pipe through `more` pager"
 if unzip -v 2>/dev/null | string match -eq Debian
 
     # the first non-switch argument should be the zipfile
-    complete -c unzip -n __fish_is_first_token -xa '(
+    complete -c unzip -n __fish_is_first_token -k -xa '(
         __fish_complete_suffix .zip
         __fish_complete_suffix .jar
         __fish_complete_suffix .aar
@@ -41,7 +41,7 @@ if unzip -v 2>/dev/null | string match -eq Debian
 else
 
     # all tokens should be zip files
-    complete -c unzip -xa '(
+    complete -c unzip -k -xa '(
         __fish_complete_suffix .zip
         __fish_complete_suffix .jar
         __fish_complete_suffix .aar
diff --git a/share/completions/unzstd.fish b/share/completions/unzstd.fish
index 1a930a35f..5cc534b04 100644
--- a/share/completions/unzstd.fish
+++ b/share/completions/unzstd.fish
@@ -1,6 +1,6 @@
 # Completions for unzstd
 
-complete -c unzstd -x -a "
+complete -c unzstd -k -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/xbps-rindex.fish b/share/completions/xbps-rindex.fish
index 66b05eec5..b4058692f 100644
--- a/share/completions/xbps-rindex.fish
+++ b/share/completions/xbps-rindex.fish
@@ -15,8 +15,8 @@ complete -c $progname -s V -d 'Show the version information'
 complete -c $progname -l signedby -d 'Name and email of person signing the repository'
 complete -c $progname -l privkey -d 'Path to the private RSA key to sign the repository. Defaults to ~/.ssh/id_rsa' -F
 
-complete -c $progname -s a -d 'Register the binary package into the local repository' -xa "(__fish_complete_suffix .xbps)"
+complete -c $progname -s a -d 'Register the binary package into the local repository' -k -xa "(__fish_complete_suffix .xbps)"
 complete -c $progname -s c -d 'Remove obsolete entries found in the local repository' -xa "(__fish_complete_directories)"
 complete -c $progname -s r -d 'Remove obsolete and currently unregistered packages from the local repository' -xa "(__fish_complete_directories)"
 complete -c $progname -s s -d 'Initialize a signed repository with your specified RSA key' -xa "(__fish_complete_directories)"
-complete -c $progname -s S -d 'Sign a binary package archive with your specified RSA key' -xa "(__fish_complete_suffix .xbps)"
+complete -c $progname -s S -d 'Sign a binary package archive with your specified RSA key' -k -xa "(__fish_complete_suffix .xbps)"
diff --git a/share/completions/xdvi.fish b/share/completions/xdvi.fish
index 28f4b3323..b1d9cf939 100644
--- a/share/completions/xdvi.fish
+++ b/share/completions/xdvi.fish
@@ -1 +1 @@
-complete -c xdvi -x -a "(__fish_complete_suffix .dvi)"
+complete -c xdvi -k -x -a "(__fish_complete_suffix .dvi)"
diff --git a/share/completions/xpdf.fish b/share/completions/xpdf.fish
index aff6b3989..229d68524 100644
--- a/share/completions/xpdf.fish
+++ b/share/completions/xpdf.fish
@@ -2,7 +2,7 @@
 # Completions for the xpdf command
 # Vikas Gorur <vikas@80x25.org>
 #
-complete -c xpdf -x -a "(__fish_complete_suffix .pdf)"
+complete -c xpdf -k -x -a "(__fish_complete_suffix .pdf)"
 
 complete -c xpdf -s g -d "Set the initial window geometry"
 complete -c xpdf -o title -d "Set the window title"
diff --git a/share/completions/xsv.fish b/share/completions/xsv.fish
index 2afdc024a..49e7dbfa8 100644
--- a/share/completions/xsv.fish
+++ b/share/completions/xsv.fish
@@ -19,7 +19,7 @@ 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)'
+complete -c xsv -n 'not __fish_is_first_token' -k -xa '(__fish_complete_suffix .csv)'
 complete -c xsv -n 'not __fish_is_first_token' -s h -l help -d 'Display help for this xsv command'
 
 # without a subcommand
diff --git a/share/completions/xz.fish b/share/completions/xz.fish
index 3bceaa5c5..4861c7a44 100644
--- a/share/completions/xz.fish
+++ b/share/completions/xz.fish
@@ -1,5 +1,5 @@
 complete -c xz -s z -l compress -d Compress
-complete -c xz -s d -l decompress -l uncompress -d Decompress -x -a "
+complete -c xz -s d -l decompress -l uncompress -d Decompress -k -x -a "
 (
     __fish_complete_suffix .xz
     __fish_complete_suffix .txz
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index ebfef0d7b..42dcf041c 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -118,7 +118,7 @@ complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packa
 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 -r -l backupfile -k -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'
 
 # Remove options
@@ -170,7 +170,7 @@ 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, 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'
+complete -c $progname -n "$upgrade" -k -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
diff --git a/share/completions/zcat.fish b/share/completions/zcat.fish
index 9487bb42f..28da9e4f2 100644
--- a/share/completions/zcat.fish
+++ b/share/completions/zcat.fish
@@ -1,4 +1,4 @@
-complete -c zcat -x -a "(
+complete -c zcat -k -x -a "(
 	__fish_complete_suffix .gz
 	__fish_complete_suffix .tgz
 )
diff --git a/share/completions/zopflipng.fish b/share/completions/zopflipng.fish
index 837d3a5ba..ac2ad0169 100644
--- a/share/completions/zopflipng.fish
+++ b/share/completions/zopflipng.fish
@@ -1,4 +1,4 @@
-complete -x -c zopflipng -a "(__fish_complete_suffix .png)"
+complete -x -c zopflipng -k -a "(__fish_complete_suffix .png)"
 
 complete -c zopflipng -s m -d "Compress more"
 complete -c zopflipng -l prefix -d "Add prefix"
diff --git a/share/completions/zstd.fish b/share/completions/zstd.fish
index 528f983ea..13002ac9b 100644
--- a/share/completions/zstd.fish
+++ b/share/completions/zstd.fish
@@ -1,7 +1,7 @@
 # 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 "
+complete -c zstd -s d -l decompress -l uncompress -d Decompress -k -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/zstdcat.fish b/share/completions/zstdcat.fish
index 0eff2939e..39b1df198 100644
--- a/share/completions/zstdcat.fish
+++ b/share/completions/zstdcat.fish
@@ -1,6 +1,6 @@
 # Completions for zstdcat
 
-complete -c zstdcat -x -a "
+complete -c zstdcat -k -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/completions/zstdmt.fish b/share/completions/zstdmt.fish
index 672dc5659..6d183de64 100644
--- a/share/completions/zstdmt.fish
+++ b/share/completions/zstdmt.fish
@@ -1,7 +1,7 @@
 # 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 "
+complete -c zstdmt -s d -l decompress -l uncompress -d Decompress -k -x -a "
 (
     __fish_complete_suffix .zst
 )
diff --git a/share/functions/__fish_complete_docutils.fish b/share/functions/__fish_complete_docutils.fish
index 00a08e83a..9a13c92e8 100644
--- a/share/functions/__fish_complete_docutils.fish
+++ b/share/functions/__fish_complete_docutils.fish
@@ -1,5 +1,5 @@
 function __fish_complete_docutils -d "Completions for Docutils common options" -a cmd
-    complete -x -c $cmd -a "
+    complete -x -c $cmd -k -a "
     (
         __fish_complete_suffix .rst
         __fish_complete_suffix .txt