4 files changed, 72 insertions, 71 deletions
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index 3ea1ff5ae..1f9b62b7d 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -18,11 +18,11 @@ _last         _loadkeys     _ruby         _sysctl       _links        _samba
 _user_admin   _rsync        _arping	  _spamassassin _mtools       _ifconfig
 _fsh          _chkconfig    _cdcd         _irssi        _mysqldiff    _sccs
 _netcat       _larch        _texinfo	  _figlet       _elinks       _tidy
-_global                     _ant          _lsof         _mt           _xmlsoft
-_perforce     _python       _antiword     _screen       _renice       _apm
-_aap          _attr         _chmod        _du           _ecasound
-_getent       _gpg          _gphoto2      _less
-_nice	      _nmap         _printenv     _raggle
-_rar	      _sablotron    _sed          _subversion   _tla
-_uniq         _vorbis       _wiggle
+_aap          _ant          _antiword     _apm          _attr
+_chmod        _du           _ecasound
+_getent       _global       _gpg          _gphoto2      _less         _lsof
+_mt           _mtr          _nice         _nmap
+_perforce     _printenv     _python       _raggle       _rar	      _renice
+_sablotron    _screen       _sed          _subversion   _tla
+_uniq         _vorbis       _vux          _wiggle       _xmlsoft
 '
diff --git a/Completion/Unix/Command/_mtr b/Completion/Unix/Command/_mtr
index ab8a42335..f4df5b3cf 100644
--- a/Completion/Unix/Command/_mtr
+++ b/Completion/Unix/Command/_mtr
@@ -1,16 +1,16 @@
 #compdef mtr
 
 _arguments -C \
-	'(-h --help)'{-h,--help}'[help]' \
-	'(-v --version)'{-v,--version}'[version]' \
-	'(-r --report)'{-r,--report}'[report mode]' \
-	'(-c --report-cycles)'{-c,--report-cycles}'[report cycles]:number of pings' \
-	'(-p --psize)'{-p,--psize}'[packet size]:number of bytes' \
-	'(-t --curses)'{-t,--curses}'[curses UI]' \
-	'(-n --no-dns)'{-n,--no-dns}'[no DNS lookups]' \
-	'(-g --gtk)'{-g,--gtk}'[GTK+ UI]' \
-	'(-s --split)'{-s,--split}'[output for a split-user interface]' \
-	'(-l --raw)'{-l,--raw}'[raw output format]' \
-	'(-a --address)'{-a,--address}'[source address]:source IP:_hosts' \
-	'(-i --interval)'{-i,--interval}'[ping interval]:number of seconds' \
-	':destination host:_hosts'
+  '(-h --help)'{-h,--help}'[help]' \
+  '(-v --version)'{-v,--version}'[version]' \
+  '(-r --report)'{-r,--report}'[report mode]' \
+  '(-c --report-cycles)'{-c,--report-cycles}'[report cycles]:number of pings' \
+  '(-p --psize)'{-p,--psize}'[packet size]:number of bytes' \
+  '(-t --curses)'{-t,--curses}'[curses UI]' \
+  '(-n --no-dns)'{-n,--no-dns}'[no DNS lookups]' \
+  '(-g --gtk)'{-g,--gtk}'[GTK+ UI]' \
+  '(-s --split)'{-s,--split}'[output for a split-user interface]' \
+  '(-l --raw)'{-l,--raw}'[raw output format]' \
+  '(-a --address)'{-a,--address}'[source address]:source IP:_hosts' \
+  '(-i --interval)'{-i,--interval}'[ping interval]:number of seconds' \
+  ':destination host:_hosts'
diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla
index 22ce67133..4ae56a1d6 100644
--- a/Completion/Unix/Command/_tla
+++ b/Completion/Unix/Command/_tla
@@ -1,9 +1,11 @@
 #compdef tla
 
+local -a subcmds
+
 subcmds=(${${${(M)${(f)"$(_call_program tla tla help)"}:#[ 	]* : *}% : *}##[ 	]##} )
 
 if (( CURRENT == 2 )); then
-     _describe -t commands 'tla command' compadd - "$subcmds[@]"
+  _describe -t commands 'tla command' compadd - "$subcmds[@]"
 else
-     _files
+  _files
 fi
diff --git a/Completion/Unix/Command/_vux b/Completion/Unix/Command/_vux
index e57f6a6b5..badd9523d 100644
--- a/Completion/Unix/Command/_vux
+++ b/Completion/Unix/Command/_vux
@@ -5,60 +5,59 @@ local expl
 case "$service" in
   (vux)
 
-  _arguments -s -C \
-	'-x:action:((play\:play\ music generate\:generate\ new\ scorelist
-	            merge\:merge\ new\ songs
-		    weed\:prune\ songs\ from\ scorelist
-		    ratings\:show\ statistics force\:force-rate))' \
-	'-s:file:_files' \
-	'-a:file:_files' \
-	'-z:file:_files' \
-	'-y:file:_files' \
-	'-p:file:_files' \
-	'-w:ratings:(b t)' \
-	'-W:repeats:(a c)' \
-	'-G:age bypass method:(t s n)' \
-	'-e:pattern:' \
-	'-O:device:_files' \
-	'-M:minimum age val:' \
-	'-S[Disable saving scorelist]' \
-	'-A[Disable saving agelist]' \
-	'-Z[Disable saving countlist]' \
-	'-Y[Disable missing log]' \
-	'-c[Disable rating check]' \
-	'-d[Disable rating updates on play]' \
-	'-l[Disable rating updates on skip]' \
-	'-j[Disable repeat check]' \
-	'-b[Disable repeat updates on play]' \
-	'-k[Disable repeat updates on skip]' \
-	'-n[Disable player]' \
-	'-t:percent:' \
-	'-T:percent:' \
-	'-C:factor:' \
-	'-D:factor:' \
-	'-I:factor:' \
-	'-U:rating:' \
-	'-X:score:' \
-	'-N:count:' \
-	'-f:rating:' \
-	'-J[Accelerate decreases]' \
-	'-K[Accelerate increases]' \
-	'-u[Check age before rating]' \
-	'-R[Show ratings after processing]' \
-	'-V[Verbose file manipulation]' \
-	'-v[Show version and exit]' \
-	'-F[Skip songs with -n and -xf]' \
-	'-q[Minimize vux output]' \
-	'-P[Always play new songs]' \
-	'-g[print stats in xgraph format]' \
-	'-h[Show summary of options]'
+    _arguments -s -C \
+      '-x:action:((play\:play\ music generate\:generate\ new\ scorelist
+	           merge\:merge\ new\ songs
+		   weed\:prune\ songs\ from\ scorelist
+		   ratings\:show\ statistics force\:force-rate))' \
+      '-s:file:_files' \
+      '-a:file:_files' \
+      '-z:file:_files' \
+      '-y:file:_files' \
+      '-p:file:_files' \
+      '-w:ratings:(b t)' \
+      '-W:repeats:(a c)' \
+      '-G:age bypass method:(t s n)' \
+      '-e:pattern' \
+      '-O:device:_files' \
+      '-M:minimum age val' \
+      '-S[Disable saving scorelist]' \
+      '-A[Disable saving agelist]' \
+      '-Z[Disable saving countlist]' \
+      '-Y[Disable missing log]' \
+      '-c[Disable rating check]' \
+      '-d[Disable rating updates on play]' \
+      '-l[Disable rating updates on skip]' \
+      '-j[Disable repeat check]' \
+      '-b[Disable repeat updates on play]' \
+      '-k[Disable repeat updates on skip]' \
+      '-n[Disable player]' \
+      '-t:percent' \
+      '-T:percent' \
+      '-C:factor' \
+      '-D:factor' \
+      '-I:factor' \
+      '-U:rating' \
+      '-X:score' \
+      '-N:count' \
+      '-f:rating' \
+      '-J[Accelerate decreases]' \
+      '-K[Accelerate increases]' \
+      '-u[Check age before rating]' \
+      '-R[Show ratings after processing]' \
+      '-V[Verbose file manipulation]' \
+      '-v[Show version and exit]' \
+      '-F[Skip songs with -n and -xf]' \
+      '-q[Minimize vux output]' \
+      '-P[Always play new songs]' \
+      '-g[print stats in xgraph format]' \
+      '-h[Show summary of options]'
   ;;
 
   (vuxctl)
 
-  _wanted vuxcmd expl 'vux control command' \
+    _wanted vuxcmd expl 'vux control command' \
       compadd start clean double half up down next previous forward \
 	      replay pause resume stop reload save history help
   ;;
-
 esac