Remove the final non-builtin call from __fish_gnu_complete, to make it even faster

darcs-hash:20070118162853-ac50b-a31f51d53ba3121eaf6dfb4006dde00491fd53c2.gz

1 files changed, 21 insertions, 14 deletions

diff --git a/share/functions/__fish_gnu_complete.fish b/share/functions/__fish_gnu_complete.fish
index 3a7fa30c..47885845 100644
--- a/share/functions/__fish_gnu_complete.fish
+++ b/share/functions/__fish_gnu_complete.fish
@@ -17,27 +17,34 @@ function __fish_gnu_complete -d "Wrapper for the complete builtin. Skips the lon
 
 	set argv $argv_out
 	set argv_out
+	set -l skip_next 0
 
 	# Remove long option if not on a gnu system
-	if test $is_gnu = 0
-		for i in $argv
+	switch $is_gnu
+		case 0
+			for i in $argv
 
-			if set -q __fish_gnu_complete_skip_next
-				set -e __fish_gnu_complete_skip_next
-				continue
-			end
+				switch $skip_next
+
+					case 1
+						 set skip_next 0
+						 continue
+
+				end
 	
-			switch $i
-				case -l --long
-					set __fish_gnu_complete_skip_next 1
-					continue
+				switch $i
+
+					case -l --long
+						set skip_next 1
+						continue
+
+				end
+
+				set argv_out $argv_out $i
 			end
+			set argv $argv_out
 
-			set argv_out $argv_out $i
-		end
-		set argv $argv_out
 	end
-	set -e __fish_gnu_complete_skip_next
 	
 	complete $argv