From 7353c6f94db0adfc37c0cca9882db41e252fd82d Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Thu, 18 Jul 2013 21:26:32 +0530 Subject: [PATCH] Fixed ftp completions Merged pull request at https://github.com/fish-shell/fish-shell/pull/919 Squashed commit of the following: commit c0662a9d4da12ba49ffe1dddc918533f8a52b91f Author: Siteshwar Vashisht Date: Thu Jul 18 21:23:42 2013 +0530 Added missing quote in ftp completions commit 9ef408d0390f13be3adc02be62daae3e0f114843 Author: Konrad Borowski Date: Thu Jul 18 15:33:57 2013 +0200 Make punctuation consistent properly. Fixes #918. commit ea26da0f8284fa39dc143e3d2ad088403fa6b2ed Author: Konrad Borowski Date: Thu Jul 18 15:29:02 2013 +0200 Revert "make punctuation consistent" This reverts commit 993c02857948b45e5d17cc2696f347c73b3a450d. --- share/functions/__fish_complete_ftp.fish | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/share/functions/__fish_complete_ftp.fish b/share/functions/__fish_complete_ftp.fish index bc69acaf3..92ff0b088 100644 --- a/share/functions/__fish_complete_ftp.fish +++ b/share/functions/__fish_complete_ftp.fish @@ -1,22 +1,14 @@ function __fish_complete_ftp -d 'Complete ftp, pftp' --argument-names ftp complete -c $ftp -xa "(__fish_print_hostnames)" -d 'Hostname' -tname' - complete -c $ftp -s 4 -d 'Use only IPv4 to contact any host' - host' - complete -c $ftp -s 6 -d 'Use IPv6 only' - only' - complete -c $ftp -s p -d 'Use passive mode for data transfers' -sfers' - complete -c $ftp -s A -d 'Use active mode for data transfers' -sfers' - complete -c $ftp -s i -d 'Turn off interactive prompting during multiple file transfers' + complete -c $ftp -s 4 -d 'Use only IPv4 to contact any host' + complete -c $ftp -s 6 -d 'Use IPv6 only' + complete -c $ftp -s p -d 'Use passive mode for data transfers' + complete -c $ftp -s A -d 'Use active mode for data transfers' + complete -c $ftp -s i -d 'Turn off interactive prompting during multiple file transfers.' complete -c $ftp -s n -d 'Restrain ftp from attempting "auto-login" upon initial connection' complete -c $ftp -s e -d 'Disable command editing and history support' complete -c $ftp -s g -d 'Disable file name globbing' -Disable file name globbing' -m -d 'Do not explicitly bind data and control channels to same interface' -channels to same interface' -v -d 'Verbose. Show all server responses and data transfer stats' -es and data transfer stats' -d -d 'Enable debugging' + complete -c $ftp -s m -d 'Do not explicitly bind data and control channels to same interface' + complete -c $ftp -s v -d 'Verbose. Show all server responses and data transfer stats' + complete -c $ftp -s d -d 'Enable debugging' end