zsh-3.1.5-pws-15 dot-zsh-3.1.5-pws-15-last-snapshot-

23 files changed, 30 insertions, 25 deletions

diff --git a/Completion/User/_a2ps b/Completion/User/_a2ps
index 9923ae20d..26f4d200e 100644
--- a/Completion/User/_a2ps
+++ b/Completion/User/_a2ps
@@ -1,4 +1,4 @@
-#defcomp a2ps
+#compdef a2ps
 
 # This is for the GNU version of a2ps.
 
diff --git a/Completion/User/_compress b/Completion/User/_compress
index 860aeb5b0..84ed42fb2 100644
--- a/Completion/User/_compress
+++ b/Completion/User/_compress
@@ -1,3 +1,3 @@
-#defcomp compress
+#compdef compress
 
 _files -g '*~*.Z'
diff --git a/Completion/User/_configure b/Completion/User/_configure
index 7559852e8..01c12dd62 100644
--- a/Completion/User/_configure
+++ b/Completion/User/_configure
@@ -1,4 +1,9 @@
-#defcomp configure
+#compdef configure
 
-_long_options '*=(E|)PREFIX*' '_files -/' \
+_long_options -i '(--(disable|enable)-FEATURE* --(with|without)-PACKAGE*)' \
+              -s '(#--disable- --enable-
+	           #--enable- --disable-
+		   #--with- --without-
+		   #--without- --with-)' \
+	      '*=(E|)PREFIX*' '_files -/' \
               '*=PROGRAM*'    '_command_names'
diff --git a/Completion/User/_dd b/Completion/User/_dd
index 6b07a382c..6094d60b7 100644
--- a/Completion/User/_dd
+++ b/Completion/User/_dd
@@ -1,4 +1,4 @@
-#defcomp dd
+#compdef dd
 
 if compset -P 1 'conv\='; then
   # If there's a comma present, ignore up to the last one.  The
diff --git a/Completion/User/_dvi b/Completion/User/_dvi
index bb2fc293e..d49840ae9 100644
--- a/Completion/User/_dvi
+++ b/Completion/User/_dvi
@@ -1,3 +1,3 @@
-#defcomp xdvi dvips dvibook dviconcat dvicopy dvidvi dviselect dvitodvi dvitype
+#compdef xdvi dvips dvibook dviconcat dvicopy dvidvi dviselect dvitodvi dvitype
 
 _files -g '*.(dvi|DVI)'
diff --git a/Completion/User/_find b/Completion/User/_find
index 13d1d797e..116ee6f6b 100644
--- a/Completion/User/_find
+++ b/Completion/User/_find
@@ -1,4 +1,4 @@
-#defcomp find
+#compdef find
 
 local prev="$words[CURRENT-1]"
 
diff --git a/Completion/User/_gunzip b/Completion/User/_gunzip
index 35a27e774..7868e0c24 100644
--- a/Completion/User/_gunzip
+++ b/Completion/User/_gunzip
@@ -1,3 +1,3 @@
-#defcomp gunzip zcat
+#compdef gunzip zcat
 
 _files -g '*.[gG][z]'
diff --git a/Completion/User/_gzip b/Completion/User/_gzip
index 3cda1e4ed..59e74a441 100644
--- a/Completion/User/_gzip
+++ b/Completion/User/_gzip
@@ -1,3 +1,3 @@
-#defcomp gzip
+#compdef gzip
 
 _files -g '*~*.[gG][zZ]'
diff --git a/Completion/User/_hosts b/Completion/User/_hosts
index eb418c5b3..911cea03b 100644
--- a/Completion/User/_hosts
+++ b/Completion/User/_hosts
@@ -1,3 +1,3 @@
-#defcomp ftp ncftp ping rwho rup xping traceroute nslookup
+#compdef ftp ncftp ping rwho rup xping traceroute nslookup
 
 compgen -k hosts
diff --git a/Completion/User/_make b/Completion/User/_make
index 24d2cf3f5..f950ad754 100644
--- a/Completion/User/_make
+++ b/Completion/User/_make
@@ -1,3 +1,3 @@
-#defcomp make gmake pmake
+#compdef make gmake pmake
 
-compgen -s "\$(awk '/^[a-zA-Z0-9][^/ 	]+:/ {print \$1}' FS=: [mM]akefile)"
+compgen -s "\$(awk '/^[a-zA-Z0-9][^\/         ]+:/ {print \$1}' FS=: [mM]akefile)"
diff --git a/Completion/User/_man b/Completion/User/_man
index cd1badc4d..1a175506c 100644
--- a/Completion/User/_man
+++ b/Completion/User/_man
@@ -1,4 +1,4 @@
-#defcomp man
+#compdef man
 
 setopt localoptions rcexpandparam
 
diff --git a/Completion/User/_mh b/Completion/User/_mh
index ab78468d8..c2801b896 100644
--- a/Completion/User/_mh
+++ b/Completion/User/_mh
@@ -1,4 +1,4 @@
-#defcomp folder folders comp inc mark refile repl scan show next prev rmm pick whom mhn mhpath
+#compdef folder folders comp inc mark refile repl scan show next prev rmm pick whom mhn mhpath
 
 # Completion for all possible MH commands.
 # Alter the following two to your own mh directory and the directory
diff --git a/Completion/User/_pdf b/Completion/User/_pdf
index 11abc216b..b8759864e 100644
--- a/Completion/User/_pdf
+++ b/Completion/User/_pdf
@@ -1,3 +1,3 @@
-#defcomp acroread
+#compdef acroread
 
 _files -g '*.(pdf|PDF)'
diff --git a/Completion/User/_ps b/Completion/User/_ps
index 6bc0643b2..6c0d91a23 100644
--- a/Completion/User/_ps
+++ b/Completion/User/_ps
@@ -1,3 +1,3 @@
-#defcomp  gs ghostview gview psnup psselect pswrap pstops pstruct lpr
+#compdef  gs ghostview gview psnup psselect pswrap pstops pstruct lpr
 
 _files -g '*([pP][sS]|eps)'
diff --git a/Completion/User/_rcs b/Completion/User/_rcs
index 5e53cb4da..af66739cb 100644
--- a/Completion/User/_rcs
+++ b/Completion/User/_rcs
@@ -1,4 +1,4 @@
-#defcomp co ci rcs
+#compdef co ci rcs
 
 local nm=$compstate[nmatches]
 
diff --git a/Completion/User/_rlogin b/Completion/User/_rlogin
index 5d6daef9b..9f5f3d628 100644
--- a/Completion/User/_rlogin
+++ b/Completion/User/_rlogin
@@ -1,4 +1,4 @@
-#defcomp rlogin rsh ssh
+#compdef rlogin rsh ssh
 
 if [[ CURRENT -eq 2 ]]; then
   compgen -k hosts
diff --git a/Completion/User/_strip b/Completion/User/_strip
index 541c901ad..d9f44cc5e 100644
--- a/Completion/User/_strip
+++ b/Completion/User/_strip
@@ -1,3 +1,3 @@
-#defcomp strip
+#compdef strip
 
 _files -g '*(*)'
diff --git a/Completion/User/_stty b/Completion/User/_stty
index 73c860d54..32355be30 100644
--- a/Completion/User/_stty
+++ b/Completion/User/_stty
@@ -1,4 +1,4 @@
-#defcomp stty
+#compdef stty
 
 if [[ "$words[CURRENT-1]" = \
   (*erase|discard|status|dsusp|intr|kill|lnext|quit|reprint|start|s*p) ]]
diff --git a/Completion/User/_tar b/Completion/User/_tar
index d11ee76c8..f443fefb7 100644
--- a/Completion/User/_tar
+++ b/Completion/User/_tar
@@ -1,4 +1,4 @@
-#defcomp tar
+#compdef tar
 
 # Tar completion.  Features:
 #  - Tries to collect tar commands from second position, single letter
diff --git a/Completion/User/_tex b/Completion/User/_tex
index 1f645e2a2..ac926cfbe 100644
--- a/Completion/User/_tex
+++ b/Completion/User/_tex
@@ -1,3 +1,3 @@
-#defcomp tex latex slitex
+#compdef tex latex slitex
 
 _files -g '*.(tex|TEX|texinfo|texi)'
diff --git a/Completion/User/_uncompress b/Completion/User/_uncompress
index e25805d50..0aa1e073f 100644
--- a/Completion/User/_uncompress
+++ b/Completion/User/_uncompress
@@ -1,3 +1,3 @@
-#defcomp uncompress zmore
+#compdef uncompress zmore
 
 _files -g '*.Z'
diff --git a/Completion/User/_x_options b/Completion/User/_x_options
index 3190ee377..cd45c87f6 100644
--- a/Completion/User/_x_options
+++ b/Completion/User/_x_options
@@ -1,4 +1,4 @@
-#defpatcomp */X11/*
+#compdef -p */X11/*
 
 # A simple pattern completion, just as an example.
 
diff --git a/Completion/User/_xfig b/Completion/User/_xfig
index fcd2bba9f..a3b30bb81 100644
--- a/Completion/User/_xfig
+++ b/Completion/User/_xfig
@@ -1,3 +1,3 @@
-#defcomp xfig
+#compdef xfig
 
 _files -g '*.fig'