Merge branch 'upstream' into debian

1 files changed, 9 insertions, 3 deletions

diff --git a/Completion/Unix/Command/_w b/Completion/Unix/Command/_w
index 69751c5e5..2da57a8f6 100644
--- a/Completion/Unix/Command/_w
+++ b/Completion/Unix/Command/_w
@@ -1,17 +1,18 @@
 #compdef w
 
-local args
+local -a args
 
 case $OSTYPE in
   linux*)
     args=(
       '(H -f --from)'{-f,--from}'[toggle display of remote hostname]'
+      '(-c --container)'{-c,--container}'[show container uptime]'
       '(H -h)--no-header[suppress the heading]'
       '(H -i --ip-addr)'{-i,--ip-addr}'[display IP address instead of hostname]'
       '(H -o --old-style -s --short)'{-o,--old-style}'[old style output format]'
       '(H -s --short -o --old-style)'{-s,--short}'[use short output format]'
       '(H -u --no-current)'{-u,--no-current}'[ignore the username while figuring out the current process and cpu times]'
-      '(H -n --no-truncat)'{-n,--no-truncat}'[non-truncated listing (large)]'
+      '(H -p --pids)'{-p,--pids}'[show process IDs]'
       + H
       '(-)--help[display help information]'
       '(-)'{-V,--version}'[display version information]'
@@ -23,7 +24,7 @@ case $OSTYPE in
   openbsd*)
     args+=( '-a[translate network addresses into names]' )
   ;|
-  (free|net)bsd*|dragonfly*)
+  (free|net)bsd*|dragonfly*|darwin*)
     args+=( '-n[show network addresses as numbers]' )
   ;|
   *bsd*|dragonfly*)
@@ -35,6 +36,11 @@ case $OSTYPE in
   freebsd*|dragonfly*)
     args+=( '-d[dump process list on a per controlling tty basis]' )
   ;|
+  netbsd*)
+    args+=(
+      '-A[sort tty names alphabetically instead of utmp or utmpx order]'
+    )
+  ;|
   solaris*)
     args+=( '!(-s -w -l)'{-l,-w}
       '-s[short output form]'