3 files changed, 8 insertions, 5 deletions
diff --git a/Completion/User/_dvi b/Completion/User/_dvi
index 40794e246..8a99d1d7d 100644
--- a/Completion/User/_dvi
+++ b/Completion/User/_dvi
@@ -22,7 +22,7 @@ dvips)
     '(-X -Y)-D[set resolution]:resolution in dots per inch:' \
     '-e[set maximum character offset]:maximum character offset:' \
     '-E[generate EPSF file]' \
-    '(: -o)-f[read from stdin, write to stdout]' \
+    '(-o)-f[write to stdout]' \
     '-F[append control-D]' \
     '-h[specify additional header file]:postscript header file:_files -g \*.\(\#i\)\(ps\|eps\)' \
     '-i[one file per section]' \
diff --git a/Completion/User/_lynx b/Completion/User/_lynx
index e3b57a9b4..5da1e71cf 100644
--- a/Completion/User/_lynx
+++ b/Completion/User/_lynx
@@ -37,10 +37,10 @@ _arguments -C \
   '-head' \
   '-help' \
   '-historical' \
-  '-homepage=:URL: _urls -f' \
+  '-homepage=:URL:->html' \
   '-image_links' \
   '-ismap' \
-  '-index=:URL: _urls -f' \
+  '-index=:URL:->html' \
   '-link=:NUMBER:' \
   '-localhost' \
   '-locexec' \
@@ -95,7 +95,7 @@ _arguments -C \
   '-version' \
   '-vikeys' \
   '-width=:NUMBER:' \
-  ':url: _urls -f'
+  ':url:->html'
 
 case "$state" in
 restrictions)
@@ -106,4 +106,7 @@ restrictions)
     multibook news_post options_save outside_ftp outside_news outside_rlogin \
     outside_telnet print shell suspend telnet_port useragent
   ;;
+html)
+  _files -g '*.html' || _urls
+  ;;
 esac
diff --git a/Completion/X/_xutils b/Completion/X/_xutils
index a2ce9f654..1fe6ce468 100644
--- a/Completion/X/_xutils
+++ b/Completion/X/_xutils
@@ -8,7 +8,7 @@ xdpyinfo)
   ;;
 xwininfo)
   _x_arguments \
-    -{help,int,stats,bits,events,size,wm,shape,frame,all,english,metric} \
+    -{help,int,children,tree,stats,bits,events,size,wm,shape,frame,all,english,metric} \
     '(-id -name)-root' \
     '(-id -root)-name:name: _x_window -n' \
     '(-name -root)-id:id: _x_window'