Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -2251,21 +2251,10 @@
 			AC_SUBST(WRAPPER, "$wiiload")
 		])
 	])
 ])
 
-AC_ARG_WITH(fish_completions,
-	AS_HELP_STRING([--with-fish-completions],
-		[install completions for the fish shell]))
-AS_IF([test x"$with_fish_completions" = x""], [
-	AC_CHECK_PROG(FISH, fish, fish)
-	AS_IF([test x"$FISH" != x""], [with_fish_completions="yes"])
-])
-AS_IF([test x"$with_fish_completions" = x"yes"], [
-	AC_SUBST(FISH_COMPLETIONS, fish)
-])
-
 dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
 dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
 AC_SUBST(CPP)
 AC_SUBST(CPPFLAGS)
 dnl We use the ObjC compiler as our assembler

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -27,11 +27,10 @@
 ENCODINGS_A = @ENCODINGS_A@
 ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
 ENCODINGS_SRCS = @ENCODINGS_SRCS@
 EXCEPTIONS_A = @EXCEPTIONS_A@
 EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
-FISH_COMPLETIONS = @FISH_COMPLETIONS@
 FORWARDING_A = @FORWARDING_A@
 FORWARDING_LIB_A = @FORWARDING_LIB_A@
 LIBBASES_M = @LIBBASES_M@
 LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@
 LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@

Index: objfw.spec
==================================================================
--- objfw.spec
+++ objfw.spec
@@ -146,11 +146,11 @@
 %prep
 %autosetup
 ./autogen.sh
 
 %build
-%configure OBJC=clang --disable-rpath --with-fish-completions
+%configure OBJC=clang --disable-rpath
 %make_build
 
 %install
 %make_install
 
@@ -182,12 +182,10 @@
 %license LICENSE.QPL
 %{_bindir}/objfw-compile
 %{_bindir}/objfw-config
 %{_bindir}/objfw-embed
 %{_bindir}/objfw-new
-%{_datadir}/fish/vendor_completions.d/objfw-compile.fish
-%{_datadir}/fish/vendor_completions.d/objfw-config.fish
 %{_includedir}/ObjFW
 %{_libdir}/libobjfw.so
 
 %files -n %{libobjfwrt_pkgname}
 %license LICENSE.GPLv2
@@ -220,31 +218,27 @@
 %files -n ofarc
 %license LICENSE.GPLv2
 %license LICENSE.GPLv3
 %license LICENSE.QPL
 %{_bindir}/ofarc
-%{_datadir}/fish/vendor_completions.d/ofarc.fish
 %{_datadir}/ofarc
 
 %files -n ofdns
 %license LICENSE.GPLv2
 %license LICENSE.GPLv3
 %license LICENSE.QPL
 %{_bindir}/ofdns
-%{_datadir}/fish/vendor_completions.d/ofdns.fish
 %{_datadir}/ofdns
 
 %files -n ofhash
 %license LICENSE.GPLv2
 %license LICENSE.GPLv3
 %license LICENSE.QPL
 %{_bindir}/ofhash
-%{_datadir}/fish/vendor_completions.d/ofhash.fish
 %{_datadir}/ofhash
 
 %files -n ofhttp
 %license LICENSE.GPLv2
 %license LICENSE.GPLv3
 %license LICENSE.QPL
 %{_bindir}/ofhttp
-%{_datadir}/fish/vendor_completions.d/ofhttp.fish
 %{_datadir}/ofhttp

Index: utils/Makefile
==================================================================
--- utils/Makefile
+++ utils/Makefile
@@ -2,12 +2,11 @@
 
 SUBDIRS += ${OBJFW_NEW}	\
 	   ${OFARC}	\
 	   ${OFDNS}	\
 	   ${OFHASH}	\
-	   ${OFHTTP}	\
-	   completions
+	   ${OFHTTP}
 
 include ../buildsys.mk
 
 DISTCLEAN = objfw-config
 

DELETED utils/completions/Makefile
Index: utils/completions/Makefile
==================================================================
--- utils/completions/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../../extra.mk
-
-SUBDIRS = ${FISH_COMPLETIONS}
-
-include ../../buildsys.mk

DELETED utils/completions/fish/Makefile
Index: utils/completions/fish/Makefile
==================================================================
--- utils/completions/fish/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-DATA = objfw-compile.fish	\
-       objfw-config.fish	\
-       ofarc.fish		\
-       ofdns.fish		\
-       ofhash.fish		\
-       ofhttp.fish
-
-include ../../../buildsys.mk
-
-PACKAGE_NAME = fish/vendor_completions.d

DELETED utils/completions/fish/objfw-compile.fish
Index: utils/completions/fish/objfw-compile.fish
==================================================================
--- utils/completions/fish/objfw-compile.fish
+++ /dev/null
@@ -1,28 +0,0 @@
-complete -c objfw-compile -s o -x -d 'Specify the output name (not file name!)'
-complete -c objfw-compile -l arc -d 'Use automatic reference counting'
-complete -c objfw-compile -l lib -x -d \
-    'Compile a library (with the specified version) instead of an application'
-complete -c objfw-compile -l plugin \
-    -d 'Compile a plugin instead of an application'
-complete -c objfw-compile -l package -x -d 'Use the specified package'
-complete -c objfw-compile -l builddir -r \
-    -d 'Place built objects into the specified directory'
-complete -c objfw-compile -s D -x -d 'Pass the specified define to the compiler'
-complete -c objfw-compile -o framework -x \
-    -d 'Pass the specified -framework argument to the linker (macOS / iOS only)'
-# -f* cannot be represented.
-complete -c objfw-compile -s F -x \
-    -d 'Pass the specified -F flag to the linker (macOS / iOS only)'
-# -g* cannot be represented.
-complete -c objfw-compile -s I -x \
-    -d 'Pass the specified -I flag to the compiler'
-complete -c objfw-compile -s l -x -d 'Pass the specified -l flag to the linker'
-complete -c objfw-compile -s L -x -d 'Pass the specified -L flag to the linker'
-# -m* cannot be represented.
-# -O* cannot be represented.
-complete -c objfw-compile -o pthread \
-    -d 'Pass -pthread to the compiler and linker'
-# -std=* cannot be represented.
-# -Wl,* cannot be represented.
-# -W* cannot be represented.
-complete -c objfw-compile -l help -d 'Show this help'

DELETED utils/completions/fish/objfw-config.fish
Index: utils/completions/fish/objfw-config.fish
==================================================================
--- utils/completions/fish/objfw-config.fish
+++ /dev/null
@@ -1,33 +0,0 @@
-complete -c objfw-config -l all -d 'Outputs all flags + libs'
-complete -c objfw-config -l arc -d 'Outputs the required OBJCFLAGS to use ARC'
-complete -c objfw-config -l cflags -d 'Outputs the required CFLAGS'
-complete -c objfw-config -l cppflags -d 'Outputs the required CPPFLAGS'
-complete -c objfw-config -l cxxflags -d 'Outputs the required CXXFLAGS'
-complete -c objfw-config -l framework-libs \
-    -d 'Outputs the required LIBS, preferring frameworks'
-complete -c objfw-config -l help -d 'Print help'
-complete -c objfw-config -l ldflags -d 'Outputs the required LDFLAGS'
-complete -c objfw-config -l libs -d 'Outputs the required LIBS'
-complete -c objfw-config -l lib-cflags \
-    -d 'Outputs CFLAGS for building a library'
-complete -c objfw-config -l lib-ldflags \
-    -d 'Outputs LDFLAGS for building a library'
-complete -c objfw-config -l lib-prefix -d 'Outputs the prefix for libraries'
-complete -c objfw-config -l lib-suffix -d 'Outputs the suffix for libraries'
-complete -c objfw-config -l objc -d 'Outputs the OBJC used to compile ObjFW'
-complete -c objfw-config -l objcflags -d 'Outputs the required OBJCFLAGS'
-complete -c objfw-config -l package -x \
-    -d 'Additionally outputs the flags for the specified package'
-complete -c objfw-config -l packages-dir \
-    -d 'Outputs the directory where flags for packages are stored'
-complete -c objfw-config -l plugin-cflags \
-    -d 'Outputs CFLAGS for building a plugin'
-complete -c objfw-config -l plugin-ldflags \
-    -d 'Outputs LDFLAGS for building a plugin'
-complete -c objfw-config -l plugin-suffix -d 'Outputs the suffix for plugins'
-complete -c objfw-config -l prog-suffix -d 'Outputs the suffix for binaries'
-complete -c objfw-config -l reexport -d 'Outputs LDFLAGS to reexport ObjFW'
-complete -c objfw-config -l rpath -d 'Outputs LDFLAGS for using rpath'
-complete -c objfw-config -l static-libs \
-    -d 'Outputs the required LIBS to link ObjFW statically'
-complete -c objfw-config -l version -d 'Outputs the installed version'

DELETED utils/completions/fish/ofarc.fish
Index: utils/completions/fish/ofarc.fish
==================================================================
--- utils/completions/fish/ofarc.fish
+++ /dev/null
@@ -1,14 +0,0 @@
-complete -c ofarc -s a -l append -d 'Append to archive'
-complete -c ofarc -s c -l create -d 'Create archive'
-complete -c ofarc -s C -l directory -r -d 'Extract into the specified directory'
-complete -c ofarc -s E -l encoding -x \
-    -d 'The encoding used by the archive (only tar files)'
-complete -c ofarc -s f -l force -d 'Force / overwrite files'
-complete -c ofarc -s h -l help -d 'Show help'
-complete -c ofarc -s l -l list -d 'List all files in the archive'
-complete -c ofarc -s n -l no-clobber -d 'Never overwrite files'
-complete -c ofarc -s p -l print -d 'Print one or more files from the archive'
-complete -c ofarc -s q -l quiet -d 'Quiet mode (no output, except errors)'
-complete -c ofarc -s t -l type -x -a 'gz lha tar tgz zip' -d 'Archive type'
-complete -c ofarc -s v -l verbose -d 'Verbose output for file list'
-complete -c ofarc -s x -l extract -d 'Extract files'

DELETED utils/completions/fish/ofdns.fish
Index: utils/completions/fish/ofdns.fish
==================================================================
--- utils/completions/fish/ofdns.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-complete -c ofdns -s c -l class -x -d 'The DNS class to query (defaults to IN)'
-complete -c ofdns -s h -l help -d 'Show help'
-complete -c ofdns -s s -l server -x -d 'The server to query'
-complete -c ofdns -s t -l type -x \
-    -d 'The record type to query (defaults to ALL, can be repeated)'

DELETED utils/completions/fish/ofhash.fish
Index: utils/completions/fish/ofhash.fish
==================================================================
--- utils/completions/fish/ofhash.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-complete -c ofhash --long-option md5
-complete -c ofhash --long-option ripemd160
-complete -c ofhash --long-option sha1
-complete -c ofhash --long-option sha224
-complete -c ofhash --long-option sha256
-complete -c ofhash --long-option sha384
-complete -c ofhash --long-option sha256

DELETED utils/completions/fish/ofhttp.fish
Index: utils/completions/fish/ofhttp.fish
==================================================================
--- utils/completions/fish/ofhttp.fish
+++ /dev/null
@@ -1,15 +0,0 @@
-complete -c ofhttp -x
-complete -c ofhttp -s b -l body -r -d 'Specify the file to send as body'
-complete -c ofhttp -s c -l continue -d 'Continue download of existing file'
-complete -c ofhttp -s f -l force -d 'Force / overwrite existing file'
-complete -c ofhttp -s h -l help -d 'Show help'
-complete -c ofhttp -s H -l header -x -d 'Add a header (e.g. X-Foo:Bar)'
-complete -c ofhttp -s m -l method -x -d 'Set the method of the HTTP request'
-complete -c ofhttp -s o -l output -r -d 'Specify output file name'
-complete -c ofhttp -s O -l detect-filename \
-    -d 'Do a HEAD request to detect the file name'
-complete -c ofhttp -s P -l proxy -x -d 'Specify SOCKS5 proxy'
-complete -c ofhttp -s q -l quiet -d 'Quiet mode (no output, except errors)'
-complete -c ofhttp -s v -l verbose -d 'Verbose mode (print headers)'
-complete -c ofhttp -l insecure \
-    -d 'Ignore TLS errors and allow insecure redirects'