From 0ba8ae87eac21281e0b17eb9cbb523d133067a4a Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Wed, 8 Jun 2005 12:45:24 +0000
Subject: 21315: make completion functions give precendence to descriptions
 passed as parameters and cleanup descriptons in calling functions

---
 Completion/Unix/Command/_links | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'Completion/Unix/Command/_links')

diff --git a/Completion/Unix/Command/_links b/Completion/Unix/Command/_links
index c8a4995d5..464068d46 100644
--- a/Completion/Unix/Command/_links
+++ b/Completion/Unix/Command/_links
@@ -5,25 +5,25 @@ typeset -A opt_args
 
 _arguments -C \
   '(-help)-anonymous[restrict links so that it can run on an anonymous account]' \
-  '(-help)-assume-codepage[use the given codepage when the webpage did not specify its]:codepage:' \
+  '(-help)-assume-codepage[specify default codepage to use]:codepage' \
   '(-help)-async-dns[asynchronous DNS resolver]:bool:((0\:on 1\:off))' \
   '(-help)-download-dir[default download directory]:_files -/' \
   '(-help)-driver[graphics driver to use]:graphics driver:->graphics_drivers' \
   '(-help)-dump[dump the page as pure text]' \
-  '(-help)-format-cache-size[number of formatted document pages cached]:pages:' \
-  '(-help)-ftp-proxy[host and port number of the FTP proxy, or blank]:hostport:_hosts' \
+  '(-help)-format-cache-size[number of formatted document pages cached]:pages' \
+  '(-help)-ftp-proxy[specify ftp proxy server]:proxy:->proxies' \
   '(-help)-g[run in graphics mode rather than plain text mode]' \
   '-help[prints the help screen]' \
-  '(-help)-http-proxy[host and port number of the HTTP proxy, or blank]:hostport:_hosts' \
-  '(-help)-image-cache-size[image cache memory]:kilobytes:' \
-  '(-help)-max-connections[maximum number of concurrent connections]:max:' \
-  '(-help)-max-connections-to-host[maximum number of concurrent connection to a given host]:max:' \
-  '(-help)-memory-cache-size[cache memory]:kilobytes:' \
+  '(-help)-http-proxy[specify web proxy server]:proxy:->proxies' \
+  '(-help)-image-cache-size[image cache memory]:memory (kilobytes)' \
+  '(-help)-max-connections[maximum number of concurrent connections]:connections' \
+  '(-help)-max-connections-to-host[maximum number of concurrent connection to a given host]:connections' \
+  '(-help)-memory-cache-size[cache memory]:kilobytes' \
   '(-help)-no-connect[runs links as a separate instance]' \
-  '(-help)-receive-timeout[timeout on receive]:secs:' \
+  '(-help)-receive-timeout[timeout on receive]:timeout (seconds)' \
   '(-help)-retries[number of retries]:retries' \
   '(-help)-source[dump the source page]' \
-  '(-help)-unrestartable-receive-timeout[timeout on non restartable connections]:secs:' \
+  '(-help)-unrestartable-receive-timeout[timeout on non restartable connections]:timeout (seconds)' \
   '(-help)-version[prints the links version number and exit]' \
   ':URL:->html' && ret=0
 
@@ -35,6 +35,15 @@ case $state in
     vals=(${=${${${(f)"$(_call_program links-graphics-drivers links -driver help 2>&1)"}[-1]}//','/''}} )
     _describe -t links-graphics-drivers 'graphics driver' vals && ret=0
   ;;
+  proxies)
+    local suf=-S:
+    if compset -P '*:'; then
+      _message -e ports 'port number'
+    else
+      compset -S ':*' && suf= 
+      _hosts $suf && ret=0
+    fi
+  ;;  
 esac
 
 return ret
-- 
cgit 1.4.1