tidy up of many completions (updates, fixes, improvements and plain aesthetics)

1 files changed, 34 insertions, 44 deletions

diff --git a/Completion/Unix/Command/_apm b/Completion/Unix/Command/_apm
index 7fb035e8e..efe50d713 100644
--- a/Completion/Unix/Command/_apm
+++ b/Completion/Unix/Command/_apm
@@ -1,51 +1,41 @@
 #compdef apm
 
-if [[ $OSTYPE == linux* ]]
-then
+if [[ $OSTYPE == linux* ]]; then
 
-_arguments -C -s \
-    '(--version)-V[print the apm program and exit immediately]' \
-    '(-V)--version[print the apm program and exit immediately]' \
-    '(--verbose)-v[print information about APM BIOS and Linux APM driver version]' \
-    '(-v)--verbose[print information about APM BIOS and Linux APM driver version]' \
-    '(--minutes)-m[print total minutes remaining instead of using an hh:mm format]' \
-    '(-m)--minutes[print total minutes remaining instead of using an hh:mm format]' \
-    '(--suspend)-s[put the machine into suspend mode if possible]' \
-    '(-s)--suspend[put the machine into suspend mode if possible]' \
-    '(--standby)-S[put the machine into standby mode if possible]' \
-    '(-S)--standby[put the machine into standby mode if possible]' \
-    '(--noignore)-n[tell the system not to ignore system-generated APM message]' \
-    '(-n)--noignore[tell the system not to ignore system-generated APM message]' \
-    '(--ignore)-i[tell the system to ignore system-generated APM message]' \
-    '(-i)--ignore[tell the system to ignore system-generated APM message]'
+  _arguments -s \
+    '(-)'{-V,--version}'[print the apm program version and exit immediately]' \
+    '(-v --verbose)'{-v,--verbose}'[print information about APM BIOS and Linux APM driver version]' \
+    '(-m --minutes)'{-m,--minutes}'[print total minutes remaining instead of using an hh:mm format]' \
+    '(-s --suspend)'{-s,--suspend}'[put the machine into suspend mode if possible]' \
+    '(-S --standby)'{-S,--standby}'[put the machine into standby mode if possible]' \
+    '(-n --noignore)'{-n,--noignore}'[tell the system not to ignore system-generated APM message]' \
+    '(-i --ignore)'{-i,--ignore}'[tell the system to ignore system-generated APM message]' && return
 
-elif [[ $OSTYPE == freebsd* ]]
-then
+elif [[ $OSTYPE == freebsd* ]]; then
 
-_arguments -C \
-     '-a[display AC line status]' \
-     '-b[display battery status]' \
-     '-d[disable/enable display suspension]:bool:' \
-     '-e[disable/enable apm functions]:bool:' \
-     '-h[disable/enable HLT in kernel context switch]:bool:' \
-     '-l[display remaining battery percentage]' \
-     '-r[enable resume wakeup timer]' \
-     '-s[display status of APM support]' \
-     '-t[display estimated remaining battery life in seconds]' \
-     '-Z[transition system into standby mode]' \
-     '-z[suspend the system]'
-
-elif [[ $OSTYPE == openbsd* ]]
-then
-
-_arguments -C \
-     '-z[engage suspend mode]' \
-     '-S[engage stand-by mode]' \
-     '-l[display estimated battery lifetime percentage]' \
-     '-m[display estimated battery lifetime minutes]' \
-     '-b[display battery status]' \
-     '-a[display AC line status]' \
-     '-v[verbose]' \
-     '-f[socket]:sockname:_files'
+  _arguments \
+    '-a[display AC line status]' \
+    '-b[display battery status]' \
+    '-d[disable/enable display suspension]:bool:' \
+    '-e[disable/enable apm functions]:bool:' \
+    '-h[disable/enable HLT in kernel context switch]:bool:' \
+    '-l[display remaining battery percentage]' \
+    '-r[enable resume wakeup timer]' \
+    '-s[display status of APM support]' \
+    '-t[display estimated remaining battery life in seconds]' \
+    '-Z[transition system into standby mode]' \
+    '-z[suspend the system]' && return
 
+elif [[ $OSTYPE == openbsd* ]]; then
+  _arguments \
+    '-z[engage suspend mode]' \
+    '-S[engage stand-by mode]' \
+    '-l[display estimated battery lifetime percentage]' \
+    '-m[display estimated battery lifetime minutes]' \
+    '-b[display battery status]' \
+    '-a[display AC line status]' \
+    '-v[verbose]' \
+    '-f[socket]:sockname:_files' && return
 fi
+
+return 1