summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/X/Command/_vnc9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f13696da7..2656e0fbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-28  Oliver Kiddle  <opk@zsh.org>
+
+	* 15159: Completion/X/Command/_vnc: fix for two digit display numbers,
+	use _values for -encodings option and complete for xvncviewer
+
 2001-06-28  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* Bart: 15106, small changes in 15152: Completion/Zsh/Command/_cd,
diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc
index cd619c6f0..24ffc3f83 100644
--- a/Completion/X/Command/_vnc
+++ b/Completion/X/Command/_vnc
@@ -1,7 +1,7 @@
-#compdef vncserver vncviewer
+#compdef vncserver vncviewer xvncviewer
 
 local displays args
-displays=( ~/.vnc/$HOST:?.pid(N:r:t:s/$HOST//) )
+displays=( ~/.vnc/$HOST:<->.pid(N:r:t:s/$HOST//) )
 displays=( \\${^displays} ) 
 
 case $service in
@@ -19,10 +19,9 @@ case $service in
       - help \
 	'-help'
   ;;
-  vncviewer) 
-    # should allow list for -encodings
+  *vncviewer) 
     _xt_arguments -shared -viewonly -fullscreen -bgr233 -owncmap -truecolour \
-      '-encodings:encodings:(copyrect hextile corre rre raw)' \
+      '-encodings:encodings:_values -s " " copyrect hextile corre rre raw' \
       '-depth:depth' \
       '-passwd:file:_files' \
       '(1)-listen:display number' \