Minor polish like adding missing whitespace, switch to using --argument switch in function definitions to make code more readable, add a few minor saftey checks, etc.

darcs-hash:20070923210730-75c98-88557ba8b6020cae04a5e437c6bb6370e39c04d9.gz

4 files changed, 14 insertions, 18 deletions

diff --git a/share/functions/__fish_append.fish b/share/functions/__fish_append.fish
index e0174143..41b92d43 100644
--- a/share/functions/__fish_append.fish
+++ b/share/functions/__fish_append.fish
@@ -1,5 +1,4 @@
-function __fish_append -d "Internal completion function for appending string to the commandline"
-	set separator $argv[1]
+function __fish_append -d "Internal completion function for appending string to the commandline" --argument separator
 	set -e argv[1]
 	set str (commandline -tc| sed -ne "s/\(.*$separator\)[^$separator]*/\1/p"|sed -e "s/--.*=//")
 	printf "%s\n" "$str"$argv "$str"(printf "%s\n" $argv|sed -e "s/\(\t\|\$\)/,\1/") 
diff --git a/share/functions/__fish_complete_directories.fish b/share/functions/__fish_complete_directories.fish
index 464a73ce..ba222f0b 100644
--- a/share/functions/__fish_complete_directories.fish
+++ b/share/functions/__fish_complete_directories.fish
@@ -3,9 +3,8 @@
 # with description $argv[2] if defined, otherwise use 'Directory'
 #
 
-function __fish_complete_directories -d "Complete using directories"
+function __fish_complete_directories -d "Complete using directories" --argument comp
 
-	set comp $argv[1]
 	set desc (_ Directory)
 
 	if test (count $argv) -gt 1
diff --git a/share/functions/__fish_complete_ssh.fish b/share/functions/__fish_complete_ssh.fish
index 24123996..b4189c8d 100644
--- a/share/functions/__fish_complete_ssh.fish
+++ b/share/functions/__fish_complete_ssh.fish
@@ -1,15 +1,15 @@
 
-function __fish_complete_ssh -d "common completions for ssh commands"
+function __fish_complete_ssh -d "common completions for ssh commands" --argument command
 
-	complete -c $argv -s 1 --description "Protocoll version 1 only"
-	complete -c $argv -s 2 --description "Protocoll version 2 only"
-	complete -c $argv -s 4 --description "IPv4 addresses only"
-	complete -c $argv -s 6 --description "IPv6 addresses only"
-	complete -c $argv -s C --description "Compress all data"
-	complete -xc $argv -s c --description "Encryption algorithm" -a "blowfish 3des des"
-	complete -r -c $argv -s F --description "Configuration file"
-	complete -r -c $argv -s i --description "Identity file"
-	complete -x -c $argv -s o --description "Options" -a "
+	complete -c $command -s 1 --description "Protocoll version 1 only"
+	complete -c $command -s 2 --description "Protocoll version 2 only"
+	complete -c $command -s 4 --description "IPv4 addresses only"
+	complete -c $command -s 6 --description "IPv6 addresses only"
+	complete -c $command -s C --description "Compress all data"
+	complete -xc $command -s c --description "Encryption algorithm" -a "blowfish 3des des"
+	complete -r -c $command -s F --description "Configuration file"
+	complete -r -c $command -s i --description "Identity file"
+	complete -x -c $command -s o --description "Options" -a "
 		AddressFamily
 		BatchMode
 		BindAddress
@@ -56,6 +56,6 @@ function __fish_complete_ssh -d "common completions for ssh commands"
 		UserKnownHostsFile
 		VerifyHostKeyDNS
 	"
-	complete -c $argv -s v --description "Verbose mode"
+	complete -c $command -s v --description "Verbose mode"
 end
 
diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index 68e06bac..f6022a57 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -1,7 +1,5 @@
 
-function __fish_print_help --description "Print help message for the specified fish function or builtin"
-
-	set -l item
+function __fish_print_help --description "Print help message for the specified fish function or builtin" --argument item
 
 	switch $argv[1]
 		case '.'