From b58339667420ef41df027ce400979d602082072e Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Fri, 14 Nov 2003 11:56:52 +0000
Subject: 19244: various completion function fixes and updates

---
 Completion/Unix/Command/_w3m | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

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

diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m
index c37ab920d..1106d5987 100644
--- a/Completion/Unix/Command/_w3m
+++ b/Completion/Unix/Command/_w3m
@@ -1,6 +1,6 @@
 #compdef w3m
 
-local curcontext="$curcontext" state line
+local curcontext="$curcontext" state line expl ret=1
 typeset -A opt_args
 
 _arguments -C \
@@ -9,16 +9,15 @@ _arguments -C \
   '-l[preserved lines]:number of lines:' \
   '-B[load bookmark]' \
   '-bookmark:bookmark file:_files' \
-  '-T[content-type]:content type:' \
+  '-T[content-type]:content type' \
   '-m[internet message mode]' \
   '-v[visual startup mode]' \
   '-M[monochrome display]' \
   '-F[automatically render frame]' \
   '(-dump_source -dump_head)-dump' \
-  '-cols:column width:' \
+  '-cols:column width' \
   '(-dump -dump_head)-dump_source' \
   '(-dump -dump_source)-dump_head' \
-  '+:goto line:' \
   '-num[show line number]' \
   '-no-proxy' \
   '-no-mouse' \
@@ -28,13 +27,25 @@ _arguments -C \
   '-S[squeeze multiple blank lines]' \
   '-W[toggle wrap search mode]' \
   '-X[do not use termcap init/deinit]' \
-  '-o[option]:option-value:' \
+  '-o[option]:option-value' \
   '-config:config file:_files' \
   '-debug' \
-  ':url:->html' && return 0
+  ':url:->html' \
+  '+:goto line' && ret=0
 
-case $state in
-	html)
-	_alternative 'files:file:_files -g "*.x#html"' 'urls:url:_w3mhistory'
-	;;
-esac
+if [[ -n $state ]]; then
+  local w3mhistory
+
+  _tags files w3mhistory urls
+  while _tags; do
+    _requested files expl 'file' _files -g "*.x#html" && ret=0
+    _requested urls expl 'url' _urls && ret=0
+    if [[ -s ~/.w3m/history ]] && _requested w3mhistory; then
+      w3mhistory=( ${(f)"$(<~/.w3m/history)"} )
+      _all_labels w3mhistory expl 'url from history' compadd -a w3mhistory
+    fi
+    (( ret )) || break
+  done
+fi
+
+return ret
-- 
cgit 1.4.1