From 42ec4aa2dde5725a182e916aa731405445714453 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 30 Nov 2018 11:27:02 +0100
Subject: [PATCH] completions/configure: Use first token ending in "configure"

Fixes #5376.

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

diff --git a/share/completions/configure.fish b/share/completions/configure.fish
index f431f7db1..67eb5d519 100644
--- a/share/completions/configure.fish
+++ b/share/completions/configure.fish
@@ -12,5 +12,9 @@ complete -c configure -l host -d "Cross-compile to build programs to run on HOST
 complete -c configure -l target -d "Configure for building compilers for TARGET" -x
 
 # use autoconf's --help to generate completions:
-echo "sourcing configure completions"
-complete -c 'configure' -a '(__fish_parse_configure (commandline | string replace -r "(.*configure) .*" "\$1"))'
+complete -c 'configure' -a '(for tok in (commandline -opc)
+    if string match -q "*configure" -- $tok
+        __fish_parse_configure $tok
+        break
+    end
+end)'