[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.0-134-g6185297

Ville Skyttä ville.skytta at iki.fi
Sun Feb 17 21:50:34 UTC 2013


The following commit has been merged in the master branch:
commit 6185297fc90e82c2788a8f3ea0fd42d54267c499
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Feb 17 23:49:30 2013 +0200

    *: Line continuation, whitespace, and compgen -W ... -- "$cur" quoting cleanups.

diff --git a/completions/_mock b/completions/_mock
index 020b39b..c616aed 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -27,7 +27,7 @@ _mock()
             return 0
             ;;
         -r|--root)
-            COMPREPLY=( $( compgen -W "$( command ls $cfgdir )" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$( command ls $cfgdir )" -- "$cur" ) )
             COMPREPLY=( ${COMPREPLY[@]/%.cfg/} )
             return 0
             ;;
diff --git a/completions/_subversion b/completions/_subversion
index 103bcb8..2f1752c 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -18,9 +18,9 @@ _svn()
 
     if [[ $cword -eq 1 ]] ; then
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--version' -- $cur ) )
+            COMPREPLY=( $( compgen -W '--version' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
         fi
     else
 
@@ -196,10 +196,10 @@ _svn()
             esac
             options+=" --help --config-dir"
 
-            COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
         else
             if [[ "$command" == @(help|h|\?) ]]; then
-                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+                COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
             else
                 _filedir
             fi
@@ -221,9 +221,9 @@ _svnadmin()
 
     if [[ $cword -eq 1 ]] ; then
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--version' -- $cur ) )
+            COMPREPLY=( $( compgen -W '--version' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
         fi
     else
         case $prev in
@@ -232,7 +232,7 @@ _svnadmin()
                 return 0
                 ;;
             --fs-type)
-                COMPREPLY=( $( compgen -W 'fsfs bdb' -- $cur ) )
+                COMPREPLY=( $( compgen -W 'fsfs bdb' -- "$cur" ) )
                 return 0
                 ;;
         esac
@@ -269,10 +269,10 @@ _svnadmin()
             esac
 
             options+=" --help"
-            COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
         else
             if [[ "$command" == @(help|h|\?) ]]; then
-                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+                COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
             else
                 _filedir
             fi
@@ -294,9 +294,9 @@ _svnlook()
 
     if [[ $cword -eq 1 ]] ; then
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--version' -- $cur ) )
+            COMPREPLY=( $( compgen -W '--version' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
         fi
     else
         local command=${words[1]}
@@ -327,10 +327,10 @@ _svnlook()
             esac
 
             options+=" --help"
-            COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+            COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
         else
             if [[ "$command" == @(help|h|\?) ]]; then
-                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+                COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
             else
                 _filedir
             fi
diff --git a/completions/_yum b/completions/_yum
index 9860c54..7b3f76a 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -75,22 +75,22 @@ _yum()
 
     case $prev in
         list)
-            COMPREPLY=( $( compgen -W 'all available updates \
-                                installed extras obsoletes recent' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'all available updates installed extras
+                obsoletes recent' -- "$cur" ) )
             ;;
         clean)
-            COMPREPLY=( $( compgen -W 'packages headers metadata \
-                                cache dbcache all' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'packages headers metadata cache dbcache
+                all' -- "$cur" ) )
             ;;
         repolist)
-            COMPREPLY=( $( compgen -W 'all enabled disabled' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'all enabled disabled' -- "$cur" ) )
             ;;
         localinstall|localupdate)
             # TODO: should not match *src.rpm
             _filedir rpm
             ;;
         -d|-e)
-            COMPREPLY=( $( compgen -W '{0..10}' -- $cur ) )
+            COMPREPLY=( $( compgen -W '{0..10}' -- "$cur" ) )
             ;;
         -c)
             _filedir
@@ -99,20 +99,21 @@ _yum()
             _filedir -d
             ;;
         --enablerepo)
-            COMPREPLY=( $( compgen -W '$( _yum_repolist disabled )' -- $cur ) )
+            COMPREPLY=( $( compgen -W '$( _yum_repolist disabled )' \
+                -- "$cur" ) )
             ;;
         --disablerepo)
-            COMPREPLY=( $( compgen -W '$( _yum_repolist enabled )' -- $cur ) )
+            COMPREPLY=( $( compgen -W '$( _yum_repolist enabled )' -- "$cur" ) )
             ;;
         --disableexcludes)
             COMPREPLY=( $( compgen -W '$( _yum_repolist all ) all main' \
-                -- $cur ) )
+                -- "$cur" ) )
             ;;
         --enableplugin|--disableplugin)
-            COMPREPLY=( $( compgen -W '$( _yum_plugins )' -- $cur ))
+            COMPREPLY=( $( compgen -W '$( _yum_plugins )' -- "$cur" ) )
             ;;
         --color)
-            COMPREPLY=( $( compgen -W 'always auto never' -- $cur ))
+            COMPREPLY=( $( compgen -W 'always auto never' -- "$cur" ) )
             ;;
         -R|-x|--exclude)
             # argument required but no completions available
@@ -123,11 +124,11 @@ _yum()
             return 0
             ;;
         *)
-            COMPREPLY=( $( compgen -W 'install update check-update upgrade \
-                remove erase list info provides whatprovides clean makecache \
-                groupinstall groupupdate grouplist groupremove groupinfo \
-                search shell resolvedep localinstall localupdate deplist \
-                repolist help' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'install update check-update upgrade
+                remove erase list info provides whatprovides clean makecache
+                groupinstall groupupdate grouplist groupremove groupinfo
+                search shell resolvedep localinstall localupdate deplist
+                repolist help' -- "$cur" ) )
             ;;
     esac
 
diff --git a/completions/add_members b/completions/add_members
index 3a6661c..70b916b 100644
--- a/completions/add_members
+++ b/completions/add_members
@@ -11,7 +11,7 @@ _add_members()
             return 0
             ;;
         -w|-a|--welcome-msg|--admin-notify)
-            COMPREPLY=( $( compgen -W 'y n' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
             return 0
             ;;
     esac
@@ -19,9 +19,8 @@ _add_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--regular-members-file \
-            --digest-members-file --welcome-msg \
-            --admin-notify --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--regular-members-file --digest-members-file
+            --welcome-msg --admin-notify --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/apt-build b/completions/apt-build
index 8e59313..3812b20 100644
--- a/completions/apt-build
+++ b/completions/apt-build
@@ -40,13 +40,13 @@ _apt_build()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--help --show-upgraded -u --build-dir \
-            --repository-dir --build-only --build-command --reinstall \
-            --rebuild --remove-builddep --no-wrapper --purge --patch \
-            --patch-strip -p --yes -y --version -v --no-source' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--help --show-upgraded -u --build-dir
+            --repository-dir --build-only --build-command --reinstall --rebuild
+            --remove-builddep --no-wrapper --purge --patch --patch-strip -p
+            --yes -y --version -v --no-source' -- "$cur" ) )
 
     else
-        COMPREPLY=( $( compgen -W 'update upgrade install remove source \
+        COMPREPLY=( $( compgen -W 'update upgrade install remove source
             dist-upgrade world clean info clean-build update-repository' \
             -- "$cur" ) )
     fi
diff --git a/completions/apt-cache b/completions/apt-cache
index 3e2ca0d..085a964 100644
--- a/completions/apt-cache
+++ b/completions/apt-cache
@@ -51,18 +51,16 @@ _apt_cache()
 
     if [[ "$cur" == -* ]]; then
 
-        COMPREPLY=( $( compgen -W '-h -v -p -s -q -i -f -a -g -c \
-                -o --help --version --pkg-cache --src-cache \
-                --quiet --important --full --all-versions \
-                --no-all-versions --generate --no-generate \
-                --names-only --all-names --recurse \
-                --config-file --option --installed' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-h -v -p -s -q -i -f -a -g -c -o --help
+                --version --pkg-cache --src-cache --quiet --important --full
+                --all-versions --no-all-versions --generate --no-generate
+                --names-only --all-names --recurse --config-file --option
+                --installed' -- "$cur" ) )
     else
 
-        COMPREPLY=( $( compgen -W 'add gencaches show showpkg showsrc \
-                stats dump dumpavail unmet search search \
-                depends rdepends pkgnames dotty xvcg \
-                policy madison' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'add gencaches show showpkg showsrc stats
+                dump dumpavail unmet search search depends rdepends pkgnames
+                dotty xvcg policy madison' -- "$cur" ) )
 
     fi
 
diff --git a/completions/apt-get b/completions/apt-get
index 43170c2..8fe36f1 100644
--- a/completions/apt-get
+++ b/completions/apt-get
@@ -53,20 +53,19 @@ _apt_get()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-d -f -h -v -m -q -s -y -u -t -b -c -o \
-            --download-only --fix-broken --help --version --ignore-missing \
-            --fix-missing --no-download --quiet --simulate --just-print \
-            --dry-run --recon --no-act --yes --assume-yes --show-upgraded \
-            --only-source --compile --build --ignore-hold --target-release \
-            --no-upgrade --force-yes --print-uris --purge --reinstall \
-            --list-cleanup --default-release --trivial-only --no-remove \
-            --diff-only --no-install-recommends --tar-only --config-file \
+        COMPREPLY=( $( compgen -W '-d -f -h -v -m -q -s -y -u -t -b -c -o
+            --download-only --fix-broken --help --version --ignore-missing
+            --fix-missing --no-download --quiet --simulate --just-print
+            --dry-run --recon --no-act --yes --assume-yes --show-upgraded
+            --only-source --compile --build --ignore-hold --target-release
+            --no-upgrade --force-yes --print-uris --purge --reinstall
+            --list-cleanup --default-release --trivial-only --no-remove
+            --diff-only --no-install-recommends --tar-only --config-file
             --option --auto-remove' -- "$cur" ) )
     else
-        COMPREPLY=( $( compgen -W 'update upgrade dselect-upgrade \
-            dist-upgrade install remove purge source build-dep \
-            download changelog \
-            check clean autoclean autoremove' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'update upgrade dselect-upgrade
+            dist-upgrade install remove purge source build-dep download
+            changelog check clean autoclean autoremove' -- "$cur" ) )
     fi
 
     return 0
diff --git a/completions/aptitude b/completions/aptitude
index 1afd738..3bcfa5c 100644
--- a/completions/aptitude
+++ b/completions/aptitude
@@ -18,13 +18,11 @@ _aptitude()
     local cur prev words cword
     _init_completion || return
 
-    local dashoptions
-    dashoptions='-S -u -i -h --help --version -s --simulate -d \
-        --download-only -P --prompt -y --assume-yes -F \
-        --display-format -O --sort -w --width -f -r -g \
-        --with-recommends -R -G --without-recommends -t \
-        --target-release -V --show-versions -D --show-deps\
-        -Z -v --verbose --purge-unused --schedule-only'
+    local dashoptions='-S -u -i -h --help --version -s --simulate -d
+        --download-only -P --prompt -y --assume-yes -F --display-format -O
+        --sort -w --width -f -r -g --with-recommends -R -G --without-recommends
+        -t --target-release -V --show-versions -D --show-deps -Z -v --verbose
+        --purge-unused --schedule-only'
 
     local special i
     for (( i=0; i < ${#words[@]}-1; i++ )); do
@@ -76,12 +74,11 @@ _aptitude()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W "$dashoptions" -- "$cur" ) )
     else
-        COMPREPLY=( $( compgen -W 'update upgrade safe-upgrade forget-new \
-            clean autoclean install reinstall remove \
-            hold unhold purge markauto unmarkauto why why-not \
-            dist-upgrade full-upgrade download search show \
-            forbid-version changelog keep-all build-dep \
-            add-user-tag remove-user-tag versions' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'update upgrade safe-upgrade forget-new
+            clean autoclean install reinstall remove hold unhold purge markauto
+            unmarkauto why why-not dist-upgrade full-upgrade download search
+            show forbid-version changelog keep-all build-dep add-user-tag
+            remove-user-tag versions' -- "$cur" ) )
     fi
 
     return 0
diff --git a/completions/arch b/completions/arch
index 3bb5f57..74e9ade 100644
--- a/completions/arch
+++ b/completions/arch
@@ -10,7 +10,7 @@ _arch()
 
     case $prev in
         -w|-g|-d|--welcome-msg|--goodbye-msg|--digest)
-            COMPREPLY=( $( compgen -W 'y n' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
             return 0
             ;;
         -d|--file)
@@ -22,8 +22,8 @@ _arch()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--wipe --start --end --quiet \
-            --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--wipe --start --end --quiet --help' \
+            -- "$cur" ) )
     else
         local args=$cword
         for (( i=1; i < cword; i++ )); do
diff --git a/completions/aspell b/completions/aspell
index a663fa9..b1cd4c5 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -37,7 +37,8 @@ _aspell()
             return 0
             ;;
         --sug-mode)
-            COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'ultra fast normal bad-speller' \
+                -- "$cur" ) )
             return 0
             ;;
         --keymapping)
@@ -58,31 +59,28 @@ _aspell()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--conf= --conf-dir= --data-dir= --dict-dir= \
-            --encoding= --add-filter= --rem-filter= --mode= \
-            --add-extra-dicts= --rem-extra-dicts= \
-            --home-dir= --ignore= --ignore-accents \
-            --dont-ignore-accents --ignore-case --dont-ignore-case \
-            --ignore-repl --dont-ignore-repl --jargon --keyboard= \
-            --lang= --language-tag --local-data-dir= --master= \
-            --module --add-module-search-order \
-            --rem-module-search-order --per-conf= --personal= \
-            --prefix= --repl= --run-together --dont-run-together \
-            --run-together-limit= --run-together-min= --save-repl \
-            --dont-save-repl --set-prefix --dont-set-prefix --size= \
-            --spelling --strip-accents --dont-strip-accents \
-            --sug-mode= --add-word-list-path --rem-word-list-path \
-            --backup --dont-backup --reverse --dont-reverse \
-            --time --dont-time --keymapping= --add-email-quote= \
-            --rem-email-quote= --email-margin= --add-tex-command= \
-            --rem-tex-command= --tex-check-comments \
-            --dont-tex-check-comments --add-tex-extension \
-            --rem-tex-extension --add-sgml-check= --rem-sgml-check= \
-            --add-sgml-extension --rem-sgml-extension' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--conf= --conf-dir= --data-dir= --dict-dir=
+            --encoding= --add-filter= --rem-filter= --mode= --add-extra-dicts=
+            --rem-extra-dicts= --home-dir= --ignore= --ignore-accents
+            --dont-ignore-accents --ignore-case --dont-ignore-case
+            --ignore-repl --dont-ignore-repl --jargon --keyboard= --lang=
+            --language-tag --local-data-dir= --master= --module
+            --add-module-search-order --rem-module-search-order --per-conf=
+            --personal= --prefix= --repl= --run-together --dont-run-together
+            --run-together-limit= --run-together-min= --save-repl
+            --dont-save-repl --set-prefix --dont-set-prefix --size= --spelling
+            --strip-accents --dont-strip-accents --sug-mode=
+            --add-word-list-path --rem-word-list-path --backup --dont-backup
+            --reverse --dont-reverse --time --dont-time --keymapping=
+            --add-email-quote= --rem-email-quote= --email-margin=
+            --add-tex-command= --rem-tex-command= --tex-check-comments
+            --dont-tex-check-comments --add-tex-extension --rem-tex-extension
+            --add-sgml-check= --rem-sgml-check= --add-sgml-extension
+            --rem-sgml-extension' -- "$cur" ) )
         [[ $COMPREPLY == *= ]] && compopt -o nospace
     else
-        COMPREPLY=( $( compgen -W 'usage help check pipe list \
-            config soundslike filter version dump create merge' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'usage help check pipe list config soundslike
+            filter version dump create merge' -- "$cur" ) )
     fi
 } &&
 complete -F _aspell aspell
diff --git a/completions/autorpm b/completions/autorpm
index 377ac98..616ad8b 100644
--- a/completions/autorpm
+++ b/completions/autorpm
@@ -5,7 +5,7 @@ _autorpm()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $( compgen -W '--notty --debug --help --version auto add \
+    COMPREPLY=( $( compgen -W '--notty --debug --help --version auto add
         fullinfo info help install list remove set' -- "$cur" ) )
 
 } &&
diff --git a/completions/brctl b/completions/brctl
index 441aa08..2720715 100644
--- a/completions/brctl
+++ b/completions/brctl
@@ -9,10 +9,9 @@ _brctl()
 
     case $cword in
         1)
-            COMPREPLY=( $( compgen -W "addbr delbr addif delif \
-                setageing setbridgeprio setfd sethello \
-                setmaxage setpathcost setportprio show \
-                showmacs showstp stp" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "addbr delbr addif delif setageing
+                setbridgeprio setfd sethello setmaxage setpathcost setportprio
+                show showmacs showstp stp" -- "$cur" ) )
             ;;
         2)
             case $command in
diff --git a/completions/btdownloadheadless.py b/completions/btdownloadheadless.py
index 60d1962..dc9789a 100644
--- a/completions/btdownloadheadless.py
+++ b/completions/btdownloadheadless.py
@@ -13,13 +13,13 @@ _btdownload()
     esac
 
      if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--max_uploads --keepalive_interval \
-            --download_slice_size --request_backlog --max_message_length \
-            --ip --minport --maxport --responsefile --url --saveas --timeout \
-            --timeout_check_interval --max_slice_length --max_rate_period \
-            --bind --upload_rate_fudge --display_interval --rerequest_interval \
-            --min_peers --http_timeout --max_initiate --max_allow_in \
-            --check_hashes --max_upload_rate --snub_time --spew \
+        COMPREPLY=( $( compgen -W '--max_uploads --keepalive_interval
+            --download_slice_size --request_backlog --max_message_length
+            --ip --minport --maxport --responsefile --url --saveas --timeout
+            --timeout_check_interval --max_slice_length --max_rate_period
+            --bind --upload_rate_fudge --display_interval --rerequest_interval
+            --min_peers --http_timeout --max_initiate --max_allow_in
+            --check_hashes --max_upload_rate --snub_time --spew
             --rarest_first_cutoff --min_uploads --report_hash_failures' \
             -- "$cur" ) )
     else
diff --git a/completions/cardctl b/completions/cardctl
index 9083726..5b5bb5d 100644
--- a/completions/cardctl
+++ b/completions/cardctl
@@ -6,8 +6,8 @@ _cardctl()
     _init_completion || return
 
     if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $( compgen -W 'status config ident suspend \
-            resume reset eject insert scheme' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'status config ident suspend resume reset
+            eject insert scheme' -- "$cur" ) )
     fi
 } &&
 complete -F _cardctl cardctl pccardctl
diff --git a/completions/cfrun b/completions/cfrun
index 0be4413..7dd1bef 100644
--- a/completions/cfrun
+++ b/completions/cfrun
@@ -22,7 +22,7 @@ _cfrun()
             esac
 
             if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W '-f -h -d -S -T -v' -- $cur ) )
+                COMPREPLY=( $( compgen -W '-f -h -d -S -T -v' -- "$cur" ) )
             else
                 hostfile=${CFINPUTS:-/var/lib/cfengine/inputs}/cfrun.hosts
                 for (( i=1; i < cword; i++ )); do
diff --git a/completions/change_pw b/completions/change_pw
index 9885258..abc7d6b 100644
--- a/completions/change_pw
+++ b/completions/change_pw
@@ -15,8 +15,8 @@ _change_pw()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--all --domain --listname \
-            --password --quiet --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--all --domain --listname --password --quiet
+            --help' -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/chgrp b/completions/chgrp
index 7355a68..26220d9 100644
--- a/completions/chgrp
+++ b/completions/chgrp
@@ -20,9 +20,9 @@ _chgrp()
         for w in "${words[@]}" ; do
             [[ "$w" == -@(R|-recursive) ]] && opts="-H -L -P" && break
         done
-        COMPREPLY=( $( compgen -W '-c -h -f -R -v --changes --dereference \
-            --no-dereference --silent --quiet --reference --recursive \
-            --verbose --help --version $opts' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-c -h -f -R -v --changes --dereference
+            --no-dereference --silent --quiet --reference --recursive --verbose
+            --help --version $opts' -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/chown b/completions/chown
index f9bd968..54d89fb 100644
--- a/completions/chown
+++ b/completions/chown
@@ -25,8 +25,8 @@ _chown()
         for w in "${words[@]}" ; do
             [[ "$w" == -@(R|-recursive) ]] && opts="-H -L -P" && break
         done
-        COMPREPLY=( $( compgen -W '-c -h -f -R -v --changes --dereference \
-            --no-dereference --from --silent --quiet --reference --recursive \
+        COMPREPLY=( $( compgen -W '-c -h -f -R -v --changes --dereference
+            --no-dereference --from --silent --quiet --reference --recursive
             --verbose --help --version $opts' -- "$cur" ) )
     else
         local args
diff --git a/completions/cleanarch b/completions/cleanarch
index df18aaf..7fb0529 100644
--- a/completions/cleanarch
+++ b/completions/cleanarch
@@ -6,8 +6,8 @@ _cleanarch()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--status --dry-run --quiet \
-            --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--status --dry-run --quiet --help' \
+            -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/clisp b/completions/clisp
index fd19b25..cdbf6bd 100644
--- a/completions/clisp
+++ b/completions/clisp
@@ -9,9 +9,9 @@ _clisp()
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-h --help --version --license -B -K \
-        -M -m -L -N -E -q --quiet --silent -w -I -ansi \
-         -traditional -p -C -norc -i -c -l -o -x ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-h --help --version --license -B -K -M -m -L
+            -N -E -q --quiet --silent -w -I -ansi -traditional -p -C -norc -i
+            -c -l -o -x ' -- "$cur" ) )
     else
         _filedir
     fi
diff --git a/completions/clone_member b/completions/clone_member
index 74608f9..9dd55fe 100644
--- a/completions/clone_member
+++ b/completions/clone_member
@@ -15,8 +15,8 @@ _clone_member()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--listname --remove --admin \
-            --quiet --nomodify --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--listname --remove --admin --quiet
+            --nomodify --help' -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/complete b/completions/complete
index ebf9023..bcac435 100644
--- a/completions/complete
+++ b/completions/complete
@@ -7,16 +7,16 @@ _complete()
 
     case $prev in
         -o)
-            COMPREPLY=( $( compgen -W 'bashdefault default dirnames filenames \
+            COMPREPLY=( $( compgen -W 'bashdefault default dirnames filenames
                 nospace plusdirs' -- "$cur" ) )
             return 0
             ;;
 
         -A)
-            COMPREPLY=( $( compgen -W 'alias arrayvar binding builtin command \
-                directory disabled enabled export file function group \
-                helptopic hostname job keyword running service setopt shopt \
-                signal stopped user variable' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'alias arrayvar binding builtin command
+                directory disabled enabled export file function group helptopic
+                hostname job keyword running service setopt shopt signal
+                stopped user variable' -- "$cur" ) )
             return 0
             ;;
 
diff --git a/completions/config_list b/completions/config_list
index 50fa050..68ab6cb 100644
--- a/completions/config_list
+++ b/completions/config_list
@@ -15,8 +15,8 @@ _config_list()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--inputfile --outputfile \
-            --checkonly --verbose --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--inputfile --outputfile --checkonly
+            --verbose --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/convert b/completions/convert
index c86293a..ffb320e 100644
--- a/completions/convert
+++ b/completions/convert
@@ -4,8 +4,8 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $( compgen -W 'Red Green Blue Opacity \
-                Matte Cyan Magenta Yellow Black' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur" ) )
             return 0
             ;;
         -colormap)
@@ -13,19 +13,19 @@ _ImageMagick()
             return 0
             ;;
         -colorspace)
-            COMPREPLY=( $( compgen -W 'GRAY OHTA RGB Transparent \
-                XYZ YCbCr YIQ YPbPr YUV CMYK' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur" ) )
             return 0
             ;;
         -compose)
-            COMPREPLY=( $( compgen -W 'Over In Out Atop Xor Plus \
-                Minus Add Subtract Difference Multiply Bumpmap\
-                Copy CopyRed CopyGreen CopyBlue CopyOpacity' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Over In Out Atop Xor Plus Minus Add
+                Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
+                CopyBlue CopyOpacity' -- "$cur" ) )
             return 0
             ;;
         -compress)
-            COMPREPLY=( $( compgen -W 'None BZip Fax Group4 JPEG \
-                Lossless LZW RLE Zip' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur" ) )
             return 0
             ;;
         -dispose)
@@ -34,9 +34,9 @@ _ImageMagick()
             return 0
             ;;
         -encoding)
-            COMPREPLY=( $( compgen -W 'AdobeCustom AdobeExpert \
-                AdobeStandard AppleRoman BIG5 GB2312 Latin2 \
-                None SJIScode Symbol Unicode Wansung' -- "$cur"))
+            COMPREPLY=( $( compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+                AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
+                Wansung' -- "$cur" ) )
             return 0
             ;;
         -endian)
@@ -44,9 +44,9 @@ _ImageMagick()
             return 0
             ;;
         -filter)
-            COMPREPLY=( $( compgen -W 'Point Box Triangle Hermite \
-                Hanning Hamming Blackman Gaussian Quadratic \
-                Cubic Catrom Mitchell Lanczos Bessel Sinc' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Point Box Triangle Hermite Hanning
+                Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
+                Lanczos Bessel Sinc' -- "$cur" ) )
             return 0
             ;;
         -format)
@@ -56,13 +56,13 @@ _ImageMagick()
             return 0
             ;;
         -gravity)
-            COMPREPLY=( $( compgen -W 'Northwest North NorthEast \
-                West Center East SouthWest South SouthEast' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur" ) )
             return 0
             ;;
         -intent)
-            COMPREPLY=( $( compgen -W 'Absolute Perceptual \
-                Relative Saturation' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur" ) )
             return 0
             ;;
         -interlace)
@@ -74,7 +74,7 @@ _ImageMagick()
             return 0
             ;;
         -list)
-            COMPREPLY=( $( compgen -W 'Delegate Format Magic Module Resource \
+            COMPREPLY=( $( compgen -W 'Delegate Format Magic Module Resource
                 Type' -- "$cur" ) )
             return 0
             ;;
@@ -85,18 +85,16 @@ _ImageMagick()
             return 0
             ;;
         -noise)
-            COMPREPLY=( $( compgen -W 'Uniform Gaussian Multiplicative \
+            COMPREPLY=( $( compgen -W 'Uniform Gaussian Multiplicative
                 Impulse Laplacian Poisson' -- "$cur" ) )
             return 0
             ;;
         -preview)
-            COMPREPLY=( $( compgen -W 'Rotate Shear Roll Hue \
-                Saturation Brightness Gamma Spiff \
-                Dull Grayscale Quantize Despeckle \
-                ReduceNoise AddNoise Sharpen Blur \
-                Treshold EdgeDetect Spread Shade \
-                Raise Segment Solarize Swirl Implode \
-                Wave OilPaint CharcoalDrawing JPEG' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'Rotate Shear Roll Hue Saturation
+                Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
+                ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
+                Shade Raise Segment Solarize Swirl Implode Wave OilPaint
+                CharcoalDrawing JPEG' -- "$cur" ) )
             return 0
             ;;
         -mask|-profile|-texture|-tile|-write)
@@ -104,13 +102,13 @@ _ImageMagick()
             return 0
             ;;
         -type)
-            COMPREPLY=( $( compgen -W 'Bilevel Grayscale Palette PaletteMatte \
-                TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte \
+            COMPREPLY=( $( compgen -W 'Bilevel Grayscale Palette PaletteMatte
+                TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
                 Optimize' -- "$cur" ) )
             return 0
             ;;
         -units)
-            COMPREPLY=( $( compgen -W 'Undefined PixelsPerInch \
+            COMPREPLY=( $( compgen -W 'Undefined PixelsPerInch
                 PixelsPerCentimeter' -- "$cur" ) )
             return 0
             ;;
@@ -119,8 +117,9 @@ _ImageMagick()
             return 0
             ;;
         -visual)
-            COMPREPLY=( $( compgen -W 'StaticGray GrayScale StaticColor \
-                PseudoColor TrueColor DirectColor defaut visualid' -- "$cur" ))
+            COMPREPLY=( $( compgen -W 'StaticGray GrayScale StaticColor
+                PseudoColor TrueColor DirectColor defaut visualid' \
+                    -- "$cur" ) )
             return 0
             ;;
     esac
@@ -138,10 +137,9 @@ _convert()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $( compgen -W '+adjoin +append +compress \
-            +contrast +debug +dither +endian +gamma +label +map \
-            +mask +matte +negate +noise +page +raise +render \
-            +write' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '+adjoin +append +compress +contrast +debug
+            +dither +endian +gamma +label +map +mask +matte +negate +noise
+            +page +raise +render +write' -- "$cur" ) )
     else
         _filedir
     fi
@@ -158,9 +156,8 @@ _mogrify()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $( compgen -W '+compress +contrast +debug +dither \
-            +endian +gamma +label +map +mask +matte +negate +page \
-            +raise' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur" ) )
     else
         _filedir
     fi
@@ -177,9 +174,8 @@ _display()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $( compgen -W '+compress +contrast +debug +dither \
-            +endian +gamma +label +map +matte +negate +page \
-            +raise +write' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur" ) )
     else
         _filedir
     fi
@@ -231,8 +227,8 @@ _montage()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $( compgen -W '+adjoin +compress +debug +dither \
-            +endian +gamma +label +matte +page' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur" ) )
     else
         _filedir
     fi
@@ -249,7 +245,7 @@ _composite()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
     elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $( compgen -W '+compress +debug +dither +endian +label \
+        COMPREPLY=( $( compgen -W '+compress +debug +dither +endian +label
             +matte +negate +page +write' -- "$cur" ) )
     else
         _filedir
diff --git a/completions/cryptsetup b/completions/cryptsetup
index fb39021..a295a14 100644
--- a/completions/cryptsetup
+++ b/completions/cryptsetup
@@ -33,9 +33,9 @@ _cryptsetup()
             COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
             [[ $COMPREPLY == *= ]] && compopt -o nospace
         else
-            COMPREPLY=( $( compgen -W 'create remove status resize luksFormat \
-                luksOpen luksClose luksSuspend luksResume luksAddKey \
-                luksRemoveKey luksKillSlot luksDelKey luksUUID isLuks \
+            COMPREPLY=( $( compgen -W 'create remove status resize luksFormat
+                luksOpen luksClose luksSuspend luksResume luksAddKey
+                luksRemoveKey luksKillSlot luksDelKey luksUUID isLuks
                 luksDump luksHeaderBackup luksHeaderRestore' -- "$cur" ) )
         fi
     else
diff --git a/completions/cvs b/completions/cvs
index 4613742..7127755 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -326,7 +326,7 @@ _cvs()
                 fi
                 pwd=$( pwd )
                 pwd=${pwd##*/}
-                COMPREPLY=( $( compgen -W '${COMPREPLY[@]} $pwd' -- $cur ) )
+                COMPREPLY=( $( compgen -W '${COMPREPLY[@]} $pwd' -- "$cur" ) )
             else
                 _cvs_command_options "$1" $mode
             fi
@@ -376,9 +376,9 @@ _cvs()
                     ;;
             esac
 
-            COMPREPLY=( $( compgen -W '$( _cvs_commands ) \
-                $( _parse_help "$1" --help-options ) \
-                --help --help-commands --help-options --version' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '$( _cvs_commands )
+                $( _parse_help "$1" --help-options ) --help --help-commands
+                --help-options --version' -- "$cur" ) )
             ;;
     esac
 
diff --git a/completions/dhclient b/completions/dhclient
index 10bbbe6..54d89d3 100644
--- a/completions/dhclient
+++ b/completions/dhclient
@@ -17,8 +17,8 @@ _dhclient()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-p -d -q -1 -r -lf -pf \
-            -cf -sf -s -g -n -nw -w' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-p -d -q -1 -r -lf -pf -cf -sf -s -g -n -nw
+            -w' -- "$cur" ) )
     else
         _available_interfaces
     fi
diff --git a/completions/dpkg b/completions/dpkg
index b1b34e1..d14e5e3 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -111,7 +111,7 @@ _dpkg_reconfigure()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only \
+        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only
                       --help --showold --force --terse' -- "$cur" ) )
     else
         COMPREPLY=( $( _comp_dpkg_installed_packages "$cur" ) )
diff --git a/completions/dselect b/completions/dselect
index 9da1e92..ee3cb2a 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -17,11 +17,11 @@ _dselect()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--admindir --help --version --licence \
-            --license --expert --debug' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--admindir --help --version --licence
+            --expert --debug' -- "$cur" ) )
     else
-        COMPREPLY=( $( compgen -W 'access update select install config \
-            remove quit' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'access update select install config remove
+            quit' -- "$cur" ) )
     fi
 
     return 0
diff --git a/completions/dumpdb b/completions/dumpdb
index 461401c..f097f89 100644
--- a/completions/dumpdb
+++ b/completions/dumpdb
@@ -6,8 +6,8 @@ _dumpdb()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--marshal --pickle --noprint \
-            --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--marshal --pickle --noprint --help' \
+            -- "$cur" ) )
     else
         _filedir
     fi
diff --git a/completions/find b/completions/find
index 2afb6fc..1896fc2 100644
--- a/completions/find
+++ b/completions/find
@@ -56,8 +56,8 @@ _find()
             return 0
             ;;
         -regextype)
-            COMPREPLY=( $( compgen -W 'emacs posix-awk posix-basic \
-                posix-egrep posix-extended' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'emacs posix-awk posix-basic posix-egrep
+                posix-extended' -- "$cur" ) )
             return 0
             ;;
     esac
@@ -77,17 +77,16 @@ _find()
     fi
 
     # complete using basic options
-    COMPREPLY=( $( compgen -W '-daystart -depth -follow -help \
-        -ignore_readdir_race -maxdepth -mindepth -mindepth -mount \
-        -noignore_readdir_race -noleaf -regextype -version -warn -nowarn \
-        -xdev \
-        -amin -anewer -atime -cmin -cnewer -ctime -empty -executable -false \
-        -fstype -gid -group -ilname -iname -inum -ipath -iregex -iwholename \
-        -links -lname -mmin -mtime -name -newer -nogroup -nouser -path -perm \
-        -readable -regex -samefile -size -true -type -uid -used -user \
-        -wholename -writable -xtype -context \
-        -delete -exec -execdir -fls -fprint -fprint0 -fprintf -ls -ok -okdir \
-        -print -print0 -printf -prune -quit' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W '-daystart -depth -follow -help
+        -ignore_readdir_race -maxdepth -mindepth -mindepth -mount
+        -noignore_readdir_race -noleaf -regextype -version -warn -nowarn -xdev
+        -amin -anewer -atime -cmin -cnewer -ctime -empty -executable -false
+        -fstype -gid -group -ilname -iname -inum -ipath -iregex -iwholename
+        -links -lname -mmin -mtime -name -newer -nogroup -nouser -path -perm
+        -readable -regex -samefile -size -true -type -uid -used -user
+        -wholename -writable -xtype -context -delete -exec -execdir -fls
+        -fprint -fprint0 -fprintf -ls -ok -okdir -print -print0 -printf -prune
+        -quit' -- "$cur" ) )
 
     if [[ ${#COMPREPLY[@]} -ne 0 ]]; then
         # this removes any options from the list of completions that have
diff --git a/completions/find_member b/completions/find_member
index d306f1b..b1fcaf6 100644
--- a/completions/find_member
+++ b/completions/find_member
@@ -15,8 +15,8 @@ _find_member()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--listname --exclude --owners \
-            --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--listname --exclude --owners --help' \
+            -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/gcl b/completions/gcl
index 2796ca0..385a2e0 100644
--- a/completions/gcl
+++ b/completions/gcl
@@ -9,8 +9,8 @@ _gcl()
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-eval -load -f -batch -dir -libdir \
-            -compile -o-file -c-file -h-file -data-file -system-p '-- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-eval -load -f -batch -dir -libdir -compile
+            -o-file -c-file -h-file -data-file -system-p' -- "$cur" ) )
     else
         _filedir
     fi
diff --git a/completions/getent b/completions/getent
index 1bb12f5..2e99f52 100644
--- a/completions/getent
+++ b/completions/getent
@@ -68,8 +68,8 @@ _getent()
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         [[ $COMPREPLY == *= ]] && compopt -o nospace
     elif [[ -z $db ]]; then
-        COMPREPLY=( $( compgen -W 'passwd group hosts services protocols \
-            networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc \
+        COMPREPLY=( $( compgen -W 'passwd group hosts services protocols
+            networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc
             shadow gshadow' -- "$cur" ) )
     fi
 } &&
diff --git a/completions/gnatmake b/completions/gnatmake
index e807d92..458ad07 100644
--- a/completions/gnatmake
+++ b/completions/gnatmake
@@ -8,17 +8,14 @@ _gnatmake()
 
     if [[ "$cur" == -* ]]; then
         # relevant (and less relevant ;-) )options completion
-        COMPREPLY=( $( compgen -W '-a -c -f -i -j -k -m -M -n -o \
-            -q -s -v -z -aL -A -aO -aI -I -I- -L -nostdinc \
-           -nostdlib -cargs -bargs -largs -fstack-check \
-           -fno-inline -g -O1 -O0 -O2 -O3 -gnata -gnatA \
-           -gnatb -gnatc -gnatd -gnatD -gnate -gnatE \
-           -gnatf -gnatF -gnatg -gnatG -gnath -gnati \
-           -gnatk -gnatl -gnatL -gnatm -gnatn -gnato \
-           -gnatO -gnatp -gnatP -gnatq -gnatR -gnats \
-           -gnatt -gnatT -gnatu -gnatU -gnatv -gnatws \
-           -gnatwe -gnatwl -gnatwu -gnatW -gnatx -gnatX \
-           -gnaty -gnatz -gnatZ -gnat83' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-a -c -f -i -j -k -m -M -n -o -q -s -v -z
+           -aL -A -aO -aI -I -I- -L -nostdinc -nostdlib -cargs -bargs -largs
+           -fstack-check -fno-inline -g -O1 -O0 -O2 -O3 -gnata -gnatA -gnatb
+           -gnatc -gnatd -gnatD -gnate -gnatE -gnatf -gnatF -gnatg -gnatG
+           -gnath -gnati -gnatk -gnatl -gnatL -gnatm -gnatn -gnato -gnatO
+           -gnatp -gnatP -gnatq -gnatR -gnats -gnatt -gnatT -gnatu -gnatU
+           -gnatv -gnatws -gnatwe -gnatwl -gnatwu -gnatW -gnatx -gnatX -gnaty
+           -gnatz -gnatZ -gnat83' -- "$cur" ) )
     else
         # source file completion
         _filedir '@(adb|ads)'
diff --git a/completions/gpg b/completions/gpg
index e91e4af..91436f7 100644
--- a/completions/gpg
+++ b/completions/gpg
@@ -19,11 +19,11 @@ _gpg()
             ;;
         -r|--recipient)
             COMPREPLY=( $( compgen -W "$( gpg --list-keys 2>/dev/null | \
-                sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ))
+                sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ) )
             if [[ -e ~/.gnupg/gpg.conf ]]; then
                 COMPREPLY+=( $( compgen -W "$( sed -ne \
                     's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1 at p' \
-                    ~/.gnupg/gpg.conf  )" -- "$cur") )
+                    ~/.gnupg/gpg.conf  )" -- "$cur" ) )
             fi
             return 0
         ;;
diff --git a/completions/gpg2 b/completions/gpg2
index 85e9f38..3efc2db 100644
--- a/completions/gpg2
+++ b/completions/gpg2
@@ -23,11 +23,11 @@ _gpg2()
             ;;
         -r|--recipient)
             COMPREPLY=( $( compgen -W "$( gpg2 --list-keys 2>/dev/null | \
-                sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ))
+                sed -ne 's@^.*<\([^>]*\)>.*$@\1 at p')" -- "$cur" ) )
             if [[ -e ~/.gnupg/gpg.conf ]]; then
                 COMPREPLY+=( $( compgen -W "$( sed -ne \
                     's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1 at p' \
-                    ~/.gnupg/gpg.conf)" -- "$cur"))
+                    ~/.gnupg/gpg.conf)" -- "$cur" ) )
             fi
         return 0
         ;;
diff --git a/completions/hcitool b/completions/hcitool
index 0a743e4..b650e20 100644
--- a/completions/hcitool
+++ b/completions/hcitool
@@ -16,9 +16,9 @@ _bluetooth_devices()
 
 _bluetooth_services()
 {
-    COMPREPLY=( $( compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG \
-        SAP NAP GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE \
-        UDITE SYNCML' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+        GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
+            -- "$cur" ) )
 }
 
 _bluetooth_packet_types()
@@ -55,9 +55,9 @@ _hcitool()
         if [[ "$cur" == -* ]]; then
             COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W 'dev inq scan name info \
-                spinq epinq cmd con cc dc sr cpt rssi lq tpl \
-                afh lst auth enc key clkoff clock' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'dev inq scan name info spinq epinq cmd
+                con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
+                clock' -- "$cur" ) )
         fi
     else
         case $arg in
@@ -126,15 +126,15 @@ _sdptool()
         if [[ "$cur" == -* ]]; then
             COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W 'search browse records add \
-                del get setattr setseq' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur" ) )
         fi
     else
         case $arg in
             search)
                 if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $( compgen -W '--bdaddr \
-                        --tree --raw --xml' -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur" ) )
                 else
                     _bluetooth_services
                 fi
@@ -155,8 +155,8 @@ _sdptool()
                 ;;
             get)
                 if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $( compgen -W '--bdaddr \
-                        --tree --raw --xml' -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur" ) )
                 fi
                 ;;
         esac
@@ -210,8 +210,8 @@ _rfcomm()
         if [[ "$cur" == -* ]]; then
             COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W 'show connect listen watch \
-                bind release' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'show connect listen watch bind
+                release' -- "$cur" ) )
         fi
     else
         _count_args
@@ -249,8 +249,8 @@ _ciptool()
         if [[ "$cur" == -* ]]; then
             COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W 'show search connect release \
-                loopback' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'show search connect release loopback' \
+                -- "$cur" ) )
         fi
     else
         case $arg in
@@ -284,8 +284,8 @@ _dfutool()
         _count_args
         case $args in
             1)
-                COMPREPLY=( $( compgen -W 'verify modify \
-                    upgrade archive' -- "$cur" ) )
+                COMPREPLY=( $( compgen -W 'verify modify upgrade archive' \
+                    -- "$cur" ) )
                 ;;
             2)
                 _filedir
@@ -306,13 +306,11 @@ _hciconfig()
         if [[ "$cur" == -* ]]; then
             COMPREPLY=( $( compgen -W '--help --all' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W 'up down reset rstat auth \
-                noauth encrypt noencrypt secmgr nosecmgr \
-                piscan noscan iscan pscan ptype name class \
-                voice iac inqmode inqdata inqtype inqparams \
-                pageparms pageto afhmode aclmtu scomtu putkey \
-                delkey commands features version revision lm' \
-                -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'up down reset rstat auth noauth encrypt
+                noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
+                class voice iac inqmode inqdata inqtype inqparams pageparms
+                pageto afhmode aclmtu scomtu putkey delkey commands features
+                version revision lm' -- "$cur" ) )
         fi
     else
         case $arg in
@@ -325,8 +323,8 @@ _hciconfig()
             lm)
                 _count_args
                 if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $( compgen -W 'MASTER \
-                        SLAVE NONE ACCEPT' -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur" ) )
                 fi
                 ;;
             ptype)
@@ -353,17 +351,16 @@ _hciattach()
         case $args in
             1)
                 COMPREPLY=( $( printf '%s\n' /dev/tty* ) )
-                COMPREPLY=( $( compgen -W '${COMPREPLY[@]} \
+                COMPREPLY=( $( compgen -W '${COMPREPLY[@]}
                     ${COMPREPLY[@]#/dev/}' -- "$cur" ) )
                 ;;
             2)
-                COMPREPLY=( $( compgen -W 'any ericsson digi \
-                    xircom csr bboxes swave bcsp 0x0105 \
-                    0x080a 0x0160 0x0002' -- "$cur" ) )
+                COMPREPLY=( $( compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur" ) )
                 ;;
             3)
-                COMPREPLY=( $( compgen -W '9600 19200 38400 \
-                    57600 115200 230400 460800 921600' -- "$cur" ) )
+                COMPREPLY=( $( compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur" ) )
                 ;;
             4)
                 COMPREPLY=( $( compgen -W 'flow noflow' -- "$cur" ) )
diff --git a/completions/hid2hci b/completions/hid2hci
index 4e2ef03..d840166 100644
--- a/completions/hid2hci
+++ b/completions/hid2hci
@@ -6,8 +6,8 @@ _hid2hci()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--help --quiet -0 --tohci -1 \
-            --tohid' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--help --quiet -0 --tohci -1 --tohid' \
+            -- "$cur" ) )
     fi
 } &&
 complete -F _hid2hci hid2hci
diff --git a/completions/installpkg b/completions/installpkg
index 956f5d0..cdaf816 100644
--- a/completions/installpkg
+++ b/completions/installpkg
@@ -21,8 +21,8 @@ _installpkg()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \
-            --menu --ask --priority --tagfile' -- "$cur") )
+        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse
+            --menu --ask --priority --tagfile' -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/ipsec b/completions/ipsec
index a586a78..b1161b0 100644
--- a/completions/ipsec
+++ b/completions/ipsec
@@ -19,22 +19,21 @@ _ipsec_freeswan()
     _init_completion || return
 
     if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $( compgen -W 'auto barf eroute klipsdebug look manual \
-            pluto ranbits rsasigkey setup showdefaults showhostkey spi spigrp \
+        COMPREPLY=( $( compgen -W 'auto barf eroute klipsdebug look manual
+            pluto ranbits rsasigkey setup showdefaults showhostkey spi spigrp
             tncfg whack' -- "$cur" ) )
         return 0
     fi
 
     case ${words[1]} in
         auto)
-            COMPREPLY=( $( compgen -W '--asynchronous --up --add --delete \
-                --replace --down --route --unroute \
-                --ready --status --rereadsecrets' \
-                -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--asynchronous --up --add --delete
+                --replace --down --route --unroute --ready --status
+                --rereadsecrets' -- "$cur" ) )
             ;;
         manual)
-            COMPREPLY=( $( compgen -W '--up --down --route --unroute \
-                --union' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--up --down --route --unroute --union' \
+                -- "$cur" ) )
             ;;
         ranbits)
             COMPREPLY=( $( compgen -W '--quick --continuous --bytes' \
@@ -56,14 +55,14 @@ _ipsec_strongswan()
     _init_completion || return
 
     if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $( compgen -W 'down irdumm leases listaacerts listacerts \
-            listalgs listall listcacerts listcainfos listcards listcerts \
+        COMPREPLY=( $( compgen -W 'down irdumm leases listaacerts listacerts
+            listalgs listall listcacerts listcainfos listcards listcerts
             listcrls listgroups listocsp listocspcerts listpubkeys openac pki
-            pluto pool purgecerts purgecrls purgeike purgeocsp ready reload \
-            rereadaacerts rereadacerts rereadall rereadcacerts rereadcrls \
-            rereadgroups rereadocspcerts rereadsecrets restart route scdecrypt \
-            scencrypt scepclient secrets start starter status statusall stop \
-            stroke unroute uci up update version whack --confdir --copyright \
+            pluto pool purgecerts purgecrls purgeike purgeocsp ready reload
+            rereadaacerts rereadacerts rereadall rereadcacerts rereadcrls
+            rereadgroups rereadocspcerts rereadsecrets restart route scdecrypt
+            scencrypt scepclient secrets start starter status statusall stop
+            stroke unroute uci up update version whack --confdir --copyright
             --directory --help --version --versioncode' -- "$cur" ) )
         return 0
     fi
@@ -77,11 +76,11 @@ _ipsec_strongswan()
             COMPREPLY=( $( compgen -W '--utc' -- "$cur" ) )
             ;;
         restart|start)
-            COMPREPLY=( $( compgen -W '--attach-gdb --auto-update --debug \
+            COMPREPLY=( $( compgen -W '--attach-gdb --auto-update --debug
                 --debug-all --debug-more --nofork' -- "$cur" ) )
             ;;
         pki)
-            COMPREPLY=( $( compgen -W '--gen --issue --keyid --print --pub \
+            COMPREPLY=( $( compgen -W '--gen --issue --keyid --print --pub
                 --req --self --signcrl --verify' -- "$cur" ) )
             ;;
         pool)
diff --git a/completions/iptables b/completions/iptables
index 5c4e073..0d54afb 100644
--- a/completions/iptables
+++ b/completions/iptables
@@ -25,31 +25,31 @@ _iptables()
         ;;
     -j)
         if [[ "$table" == "-t filter" || -z "$table" ]]; then
-            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT \
+            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT
                 `iptables $table -nL | sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
                 "$cur" ) )
         elif [[ $table == "-t nat" ]]; then
-            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT \
-                MIRROR SNAT DNAT MASQUERADE `iptables $table -nL | \
+            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT MIRROR SNAT
+                DNAT MASQUERADE `iptables $table -nL | \
                 sed -ne "$chain" -e "s/OUTPUT|PREROUTING|POSTROUTING//"`' \
                 -- "$cur" ) )
         elif [[ $table == "-t mangle" ]]; then
-            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT \
-                MARK TOS `iptables $table -nL | sed -ne "$chain" \
+            COMPREPLY=( $( compgen -W 'ACCEPT DROP LOG ULOG REJECT MARK TOS
+                `iptables $table -nL | sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
                 "$cur" ) )
         fi
         ;;
     *)
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--in-interface --out-interface --source \
-                --destination --protocol --fragment --match --append \
-                --delete --insert --replace --list --flush --zero --new \
-                --delete-chain --policy --rename-chain --proto --source \
-                --destination --in-interface --jump --match --numeric \
-                --out-interface --table --verbose --line-numbers --exact \
-                --fragment --modprobe --set-counters --version' -- "$cur") )
+            COMPREPLY=( $( compgen -W '--in-interface --out-interface --source
+                --destination --protocol --fragment --match --append --delete
+                --insert --replace --list --flush --zero --new --delete-chain
+                --policy --rename-chain --proto --source --destination
+                --in-interface --jump --match --numeric --out-interface --table
+                --verbose --line-numbers --exact --fragment --modprobe
+                --set-counters --version' -- "$cur" ) )
         fi
         ;;
     esac
diff --git a/completions/ipv6calc b/completions/ipv6calc
index 102f832..5db7271 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -28,14 +28,13 @@ _ipv6calc()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--help --debug --quiet --in \
-            --out --action --examples --showinfo --show_types \
-            --machine_readable --db-geoip --db-geoip-default \
-            --db-ip2location-ipv4 --db-ip2location-ipv6 \
-            --lowercase --uppercase --printprefix --printsuffix \
-            --maskprefix --masksuffix --printstart --printend \
-            --printcompressed --printuncompressed \
-            --printfulluncompressed --printmirrored' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--help --debug --quiet --in --out --action
+            --examples --showinfo --show_types --machine_readable --db-geoip
+            --db-geoip-default --db-ip2location-ipv4 --db-ip2location-ipv6
+            --lowercase --uppercase --printprefix --printsuffix --maskprefix
+            --masksuffix --printstart --printend --printcompressed
+            --printuncompressed --printfulluncompressed --printmirrored' \
+                -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/iwconfig b/completions/iwconfig
index 899f149..36213d2 100644
--- a/completions/iwconfig
+++ b/completions/iwconfig
@@ -7,8 +7,8 @@ _iwconfig()
 
     case $prev in
         mode)
-            COMPREPLY=( $( compgen -W 'managed ad-hoc master \
-                repeater secondary monitor' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'managed ad-hoc master repeater secondary
+                monitor' -- "$cur" ) )
             return 0
             ;;
         essid)
@@ -80,8 +80,8 @@ _iwconfig()
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $( compgen -W 'essid nwid mode freq channel sens mode \
-            ap nick rate rts frag enc key power txpower commit' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'essid nwid mode freq channel sens mode ap
+            nick rate rts frag enc key power txpower commit' -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/iwlist b/completions/iwlist
index 7819b04..78c15b7 100644
--- a/completions/iwlist
+++ b/completions/iwlist
@@ -12,9 +12,9 @@ _iwlist()
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $( compgen -W 'scan scanning freq frequency \
-            channel rate bit bitrate key enc encryption power \
-            txpower retry ap accesspoint peers event' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'scan scanning freq frequency channel rate
+            bit bitrate key enc encryption power txpower retry ap accesspoint
+            peers event' -- "$cur" ) )
     fi
 } &&
 complete -F _iwlist iwlist
diff --git a/completions/jarsigner b/completions/jarsigner
index 02befae..c1c72af 100644
--- a/completions/jarsigner
+++ b/completions/jarsigner
@@ -42,9 +42,9 @@ _jarsigner()
     if ! $jar ; then
         if [[ "$cur" == -* ]] ; then
             # Documented as "should not be used": -internalsf, -sectionsonly
-            COMPREPLY=( $( compgen -W '-keystore -storepass -storetype \
-                -keypass -sigfile -signedjar -digestalg -sigalg -verify \
-                -verbose -certs -tsa -tsacert -altsigner -altsignerpath \
+            COMPREPLY=( $( compgen -W '-keystore -storepass -storetype
+                -keypass -sigfile -signedjar -digestalg -sigalg -verify
+                -verbose -certs -tsa -tsacert -altsigner -altsignerpath
                 -protected -providerName -providerClass -providerArg' \
                 -- "$cur" ) )
         fi
diff --git a/completions/ktutil b/completions/ktutil
index e0bd60b..88eb527 100644
--- a/completions/ktutil
+++ b/completions/ktutil
@@ -14,8 +14,8 @@ _heimdal_realms()
 
 _heimdal_encodings()
 {
-    COMPREPLY=( $( compgen -W 'des-cbc-mcrc des-cbc-md4 des-cbc-md5 \
-        des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96 \
+    COMPREPLY=( $( compgen -W 'des-cbc-mcrc des-cbc-md4 des-cbc-md5
+        des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96
         aes256-cts-hmac-sha1-96' -- "$cur" ) )
 }
 
@@ -51,7 +51,7 @@ _ktutil()
 
     $split && return 0
 
-    commands='add change copy get list remove rename purge srvconvert \
+    commands='add change copy get list remove rename purge srvconvert
         srv2keytab srvcreate key2srvtab'
 
     for (( i=1; i < cword; i++ )); do
@@ -71,14 +71,14 @@ _ktutil()
     if [[ "$cur" == -* ]]; then
         case $command in
             add)
-                options='-p --principal -V -e --enctype -w --password -r \
+                options='-p --principal -V -e --enctype -w --password -r
                     --random -s --no-salt -h --hex'
             ;;
             change)
                 options='-r --realm -a --admin-server -s --server-port'
             ;;
             get)
-                options='-p --principal -e --enctype -r --realm -a \
+                options='-p --principal -e --enctype -r --realm -a
                     --admin-server -s server --server-port'
                 ;;
             list)
diff --git a/completions/larch b/completions/larch
index f6f796b..79716a5 100644
--- a/completions/larch
+++ b/completions/larch
@@ -30,7 +30,7 @@ _larch()
             distribution-name notify my-notifier mail-new-categories \
             mail-new-branches mail-new-versions mail-new-revisions \
             notify-library notify-browser push-new-revisions sendmail-mailx' \
-            "$cur" ))
+            "$cur" ) )
     fi
 
     return 0
diff --git a/completions/ldapvi b/completions/ldapvi
index f2d2c29..9c9b649 100644
--- a/completions/ldapvi
+++ b/completions/ldapvi
@@ -11,8 +11,8 @@ _ldapvi()
             return 0
             ;;
         -Y|--sasl-mech)
-            COMPREPLY=( $( compgen -W 'EXTERNAL GSSAPI DIGEST-MD5 \
-                CRAM-MD5 PLAIN ANONYMOUS' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5
+                PLAIN ANONYMOUS' -- "$cur" ) )
             return 0
             ;;
         --bind)
@@ -20,7 +20,7 @@ _ldapvi()
             return 0
             ;;
         --bind-dialog)
-            COMPREPLY=( $( compgen -W 'never auto always' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'never auto always' -- "$cur" ) )
             return 0
             ;;
         --scope)
@@ -37,8 +37,7 @@ _ldapvi()
             return 0
             ;;
         --tls)
-            COMPREPLY=( $( compgen -W 'never allow try strict' \
-                -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'never allow try strict' -- "$cur" ) )
             return 0
             ;;
     esac
diff --git a/completions/lilo b/completions/lilo
index f81f049..3073183 100644
--- a/completions/lilo
+++ b/completions/lilo
@@ -33,16 +33,16 @@ _lilo()
             ;;
         -T)
             # topic completion
-            COMPREPLY=( $( compgen -W 'help ChRul EBDA geom geom= \
-                table= video' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'help ChRul EBDA geom geom= table=
+                video' -- "$cur" ) )
             return 0
             ;;
     esac
 
     if [[ "$cur" == -* ]]; then
         # relevant options completion
-        COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m \
-            -M -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m -M -p -P
+            -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur" ) )
     fi
 } &&
 complete -F _lilo lilo
diff --git a/completions/links b/completions/links
index 5adc7de..abb1990 100644
--- a/completions/links
+++ b/completions/links
@@ -10,12 +10,12 @@ _links()
             COMPREPLY=( $( compgen -W '--help' -- "$cur" ) )
             ;;
         -*)
-            COMPREPLY=( $( compgen -W '-async-dns -max-connections \
-                -max-connections-to-host -retries -receive-timeout \
-                -unrestartable-receive-timeout -format-cache-size \
-                -memory-cache-size -http-proxy -ftp-proxy -download-dir \
-                -assume-codepage -anonymous -dump -no-connect \
-                -source -version -help' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '-async-dns -max-connections
+                -max-connections-to-host -retries -receive-timeout
+                -unrestartable-receive-timeout -format-cache-size
+                -memory-cache-size -http-proxy -ftp-proxy -download-dir
+                -assume-codepage -anonymous -dump -no-connect -source -version
+                -help' -- "$cur" ) )
                 ;;
         *)
             if [[ -r ~/.links/links.his ]]; then
diff --git a/completions/lintian b/completions/lintian
index 8e47075..1c9eaa6 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -82,17 +82,16 @@ _lintian()
     local action lint_actions general_opts behaviour_opts \
           configuration_opts selection_opts
 
-    lint_actions="--setup-lab --remove-lab --check --check-part --tags \
-                  --tags-from-file --ftp-master-rejects --dont-check-part \
-                  --unpack --remove"
+    lint_actions="--setup-lab --remove-lab --check --check-part --tags
+        --tags-from-file --ftp-master-rejects --dont-check-part --unpack
+        --remove"
     general_opts="--help --version --print-version --verbose --debug --quiet"
-    behaviour_opts="--info --display-info --display-experimental --pedantic \
-                    --display-level --suppress-tags \
-                    --suppress-tags-from-file --no-override --show-overrides \
-                    --color --unpack-info --md5sums --checksums --allow-root \
-                    --fail-on-warnings --keep-lab"
-    configuration_opts="--cfg --lab --archivedir --dist --area --section \
-                        --arch --root"
+    behaviour_opts="--info --display-info --display-experimental --pedantic
+        --display-level --suppress-tags --suppress-tags-from-file --no-override
+        --show-overrides --color --unpack-info --md5sums --checksums
+        --allow-root --fail-on-warnings --keep-lab"
+    configuration_opts="--cfg --lab --archivedir --dist --area --section --arch
+        --root"
     selection_opts="--all --binary --source --udeb --packages-file"
 
     if [[ "$prev" = -* ]]; then
@@ -126,8 +125,8 @@ _lintian()
 
     case "$cur" in
         --*)
-            COMPREPLY=($(compgen -W "$lint_actions $general_opts \
-                         $behaviour_opts $configuration_opts" -- "$cur"))
+            COMPREPLY=($(compgen -W "$lint_actions $general_opts
+                $behaviour_opts $configuration_opts" -- "$cur"))
             ;;
         *,)
             # If we're here, the user is trying to complete on
diff --git a/completions/lisp b/completions/lisp
index 941eae4..45cd4e6 100644
--- a/completions/lisp
+++ b/completions/lisp
@@ -9,8 +9,8 @@ _lisp()
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-core -lib -batch -quit -edit -eval -init \
-        -dynamic-space-size -hinit -noinit -nositeinit -load -slave ' \
+    COMPREPLY=( $( compgen -W '-core -lib -batch -quit -edit -eval -init
+        -dynamic-space-size -hinit -noinit -nositeinit -load -slave' \
         -- "$cur" ) )
     else
         _filedir
diff --git a/completions/list_lists b/completions/list_lists
index 8ef2156..04471e1 100644
--- a/completions/list_lists
+++ b/completions/list_lists
@@ -11,8 +11,8 @@ _list_lists()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--advertised --virtual-host-overview \
-            --bare --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--advertised --virtual-host-overview --bare
+            --help' -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/list_members b/completions/list_members
index b6262b7..d432b36 100644
--- a/completions/list_members
+++ b/completions/list_members
@@ -11,12 +11,12 @@ _list_members()
             return 0
             ;;
         -d|--digest)
-            COMPREPLY=( $( compgen -W 'mime plain' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'mime plain' -- "$cur" ) )
             return 0
             ;;
         -n|--nomail)
             COMPREPLY=( $( compgen -W 'byadmin byuser bybounce unknown' \
-                -- "$cur") )
+                -- "$cur" ) )
             return 0
             ;;
     esac
@@ -24,8 +24,8 @@ _list_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--output --regular --digest \
-            --nomail --fullnames --preserve --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--output --regular --digest --nomail
+            --fullnames --preserve --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/list_owners b/completions/list_owners
index e4d6750..a780265 100644
--- a/completions/list_owners
+++ b/completions/list_owners
@@ -6,8 +6,8 @@ _list_owners()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--with-listnames --moderators \
-            --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--with-listnames --moderators --help' \
+            -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/lvm b/completions/lvm
index e2f3f3c..ba0720e 100644
--- a/completions/lvm
+++ b/completions/lvm
@@ -69,9 +69,9 @@ _pvscan()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--debug --exported --novolumegroup \
-            --help --ignorelockingfailure --partial --short --uuid \
-            --verbose --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--debug --exported --novolumegroup --help
+            --ignorelockingfailure --partial --short --uuid --verbose
+            --version' -- "$cur" ) )
     fi
 } &&
 complete -F _pvscan pvscan
@@ -83,10 +83,8 @@ _pvs()
 
     case $prev in
         -o|-O|--options|--sort)
-            COMPREPLY=( $( compgen -W 'pv_fmt pv_uuid \
-                pv_size pv_free pv_used pv_name \
-                pv_attr pv_pe_count \
-                pv_pe_alloc_count' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur" ) )
             return 0
             ;;
         --units)
@@ -191,9 +189,9 @@ _pvmove()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--abort --autobackup \
-            --background --debug --force --help --interval --test --verbose \
-            --version --name' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--abort --autobackup --background --debug
+            --force --help --interval --test --verbose --version --name' \
+                -- "$cur" ) )
     else
         _lvm_physicalvolumes
     fi
@@ -231,11 +229,10 @@ _vgs()
 
     case $prev in
         -o|-O|--options|--sort)
-            COMPREPLY=( $( compgen -W 'vg_fmt vg_uuid vg_name \
-                vg_attr vg_size vg_free vg_sysid \
-                vg_extent_size vg_extent_count vg_free_count \
-                max_lv max_pv pv_count lv_count snap_count \
-                vg_seqno' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+                vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
+                max_lv max_pv pv_count lv_count snap_count vg_seqno' \
+                    -- "$cur" ) )
             return 0
             ;;
         --units)
@@ -285,11 +282,10 @@ _vgchange()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--autobackup --alloc \
-            --partial --debug --help --ignorelockingfailure \
-            --test --uuid --verbose --version \
-            --available --resizeable --logicalvolume \
-            --addtag --deltag' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--autobackup --alloc --partial --debug
+            --help --ignorelockingfailure --test --uuid --verbose --version
+            --available --resizeable --logicalvolume --addtag --deltag' \
+                -- "$cur" ) )
     else
         _lvm_volumegroups
     fi
@@ -317,10 +313,9 @@ _vgcreate()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--autobackup --addtag --alloc \
-            --debug --help --maxlogicalvolumes --metadatatype \
-            --maxphysicalvolumes --physicalextentsize --test \
-            --verbose --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--autobackup --addtag --alloc --debug --help
+            --maxlogicalvolumes --metadatatype --maxphysicalvolumes
+            --physicalextentsize --test --verbose --version' -- "$cur" ) )
     else
         local args
         _lvm_count_args @(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)
@@ -562,9 +557,8 @@ _vgsplit()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--autobackup --debug \
-            --help --list --metadatatype --test \
-            --verbose --version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--autobackup --debug --help --list
+            --metadatatype --test --verbose --version' -- "$cur" ) )
     else
         local args
         _lvm_count_args @(-A|--autobackup|-M|--metadatatype)
@@ -608,9 +602,9 @@ _lvs()
 
     case $prev in
         -o|-O|--options|--sort)
-            COMPREPLY=( $( compgen -W 'lv_uuid lv_name lv_attr lv_minor \
-                lv_size seg_count origin snap_percent segtype stripes \
-                stripesize chunksize seg_start seg_size' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+                seg_count origin snap_percent segtype stripes stripesize
+                chunksize seg_start seg_size' -- "$cur" ) )
             return 0
             ;;
         --units)
@@ -839,17 +833,13 @@ _lvm()
     _init_completion || return
 
     if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $( compgen -W 'dumpconfig help lvchange \
-            lvcreate lvdisplay lvextend lvmchange \
-            lvmdiskscan lvmsadc lvmsar lvreduce \
-            lvremove lvrename lvresize lvs lvscan \
-            pvchange pvcreate pvdata pvdisplay pvmove \
-            pvremove pvresize pvs pvscan vgcfgbackup \
-            vgcfgrestore vgchange vgck vgconvert \
-            vgcreate vgdisplay vgexport vgextend \
-            vgimport vgmerge vgmknodes vgreduce \
-            vgremove vgrename vgs vgscan vgsplit \
-            version' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+            lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
+            lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
+            pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
+            vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
+            vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
+            vgsplit version' -- "$cur" ) )
     else
         case ${words[1]} in
             pvchange)
diff --git a/completions/lzma b/completions/lzma
index d377d15..30566ed 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -7,10 +7,10 @@ _lzma()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9 \
-            --help --decompress --compress --keep --force --suffix \
-            --test --stdout --quiet --verbose --license --list \
-            --version --small --fast --best --text' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9
+            --help --decompress --compress --keep --force --suffix --test
+            --stdout --quiet --verbose --license --list --version --small
+            --fast --best --text' -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/lzop b/completions/lzop
index a5084bb..e23d541 100644
--- a/completions/lzop
+++ b/completions/lzop
@@ -20,13 +20,13 @@ _lzop()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9 -P \
-            --fast --best --decompress --extract --test --list --ls --info \
-            --sysinfo --license --help --version --stdout --output --path \
-            --force --no-checksum --no-name --name --no-mode --no-time \
-            --suffix --keep --delete --crc32 --no-warn --ignore-warn --quiet \
-            --verbose --no-stdin --filter --checksum --no-color --mono \
-            --color' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9 -P
+            --fast --best --decompress --extract --test --list --ls --info
+            --sysinfo --license --help --version --stdout --output --path
+            --force --no-checksum --no-name --name --no-mode --no-time --suffix
+            --keep --delete --crc32 --no-warn --ignore-warn --quiet --verbose
+            --no-stdin --filter --checksum --no-color --mono --color' \
+                -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/mailmanctl b/completions/mailmanctl
index 4a49668..5e6ed2e 100644
--- a/completions/mailmanctl
+++ b/completions/mailmanctl
@@ -6,7 +6,7 @@ _mailmanctl()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--no-restart --run-as-user \
+        COMPREPLY=( $( compgen -W '--no-restart --run-as-user
             --stale-lock-cleanup --quiet --help' -- "$cur" ) )
     else
         COMPREPLY=( $( compgen -W 'start stop restart reopen' -- "$cur" ) )
diff --git a/completions/makepkg b/completions/makepkg
index c24c9cc..3aa836e 100644
--- a/completions/makepkg
+++ b/completions/makepkg
@@ -13,8 +13,8 @@ _makepkg()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \
-            -c --chown' -- "$cur") )
+        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend -c --chown' \
+            -- "$cur" ) )
         return 0
     fi
 
diff --git a/completions/mdadm b/completions/mdadm
index f0e917f..111a2c3 100644
--- a/completions/mdadm
+++ b/completions/mdadm
@@ -19,13 +19,13 @@ _mdadm_raid_level()
 
     case $mode in
         create)
-            COMPREPLY=( $( compgen -W 'linear raid0 0 stripe raid1 1 mirror \
+            COMPREPLY=( $( compgen -W 'linear raid0 0 stripe raid1 1 mirror
                 raid4 4 raid5 5 raid6 6 raid10 10 multipath mp faulty' \
                 -- "$cur" ) )
             ;;
         build)
-            COMPREPLY=( $( compgen -W 'linear stripe raid0 0 raid1 multipath \
-                mp faulty' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'linear stripe raid0 0 raid1 multipath mp
+                faulty' -- "$cur" ) )
             ;;
     esac
 }
@@ -42,16 +42,16 @@ _mdadm_raid_layout()
 
     case $level in
         raid5)
-            COMPREPLY=( $( compgen -W 'left-asymmetric left-symmetric \
+            COMPREPLY=( $( compgen -W 'left-asymmetric left-symmetric
                 right-asymmetric right-symmetric la ra ls rs' -- "$cur" ) )
             ;;
         raid10)
             COMPREPLY=( $( compgen -W 'n o p' -- "$cur" ) )
             ;;
         faulty)
-            COMPREPLY=( $( compgen -W 'write-transient wt read-transient rt \
-                write-persistent wp read-persistent rp write-all read-fixable \
-                rf clear flush none' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'write-transient wt read-transient rt
+                write-persistent wp read-persistent rp write-all read-fixable
+                rf clear flush none' -- "$cur" ) )
             ;;
     esac
 }
@@ -63,7 +63,7 @@ _mdadm_auto_flag()
 
 _mdadm_update_flag()
 {
-    COMPREPLY=( $( compgen -W 'sparc2.2 summaries uuid name homehost resync \
+    COMPREPLY=( $( compgen -W 'sparc2.2 summaries uuid name homehost resync
         byteorder super-minor' -- "$cur" ) )
 }
 
@@ -98,45 +98,44 @@ _mdadm()
 
     $split && return 0
 
-    local options
-    options='--help --help-options --version --verbose --quiet \
-        --brief --force --config= --scan --metadata= --homehost='
+    local options='--help --help-options --version --verbose --quiet --brief
+        --force --config= --scan --metadata= --homehost='
 
     if [[ "$cur" == -* ]]; then
         if [[ $cword -eq 1 ]] ; then
-            COMPREPLY=( $( compgen -W "$options --assemble --build \
-                --create --monitor --grow" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$options --assemble --build --create
+                --monitor --grow" -- "$cur" ) )
         else
             case ${words[cword-1]} in
                 -A|--assemble)
-                    COMPREPLY=( $( compgen -W "$options --uuid= \
-                        --super-minor= --name= --force --run \
-                        --no-degraded --auto= --bitmap= --backup-file= \
-                        --update= --auto-update-homehost" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options --uuid= --super-minor=
+                        --name= --force --run --no-degraded --auto= --bitmap=
+                        --backup-file= --update= --auto-update-homehost" \
+                            -- "$cur" ) )
                     ;;
                 -B|-C|-G|--build|--create|--grow)
-                    COMPREPLY=( $( compgen -W "$options --raid-devices= \
-                        --spare-devices= --size= --chunk= --rounding= \
-                        --level= --layout= --parity= --bitmap= \
-                        --bitmap-chunk= --write-mostly --write-behind= \
-                        --assume-clean --backup-file= --name= --run \
-                        --force --auto=" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options --raid-devices=
+                        --spare-devices= --size= --chunk= --rounding= --level=
+                        --layout= --parity= --bitmap= --bitmap-chunk=
+                        --write-mostly --write-behind= --assume-clean
+                        --backup-file= --name= --run --force --auto=" \
+                            -- "$cur" ) )
                     ;;
                 -F|--follow|--monitor)
-                    COMPREPLY=( $( compgen -W "$options --mail --program \
-                        --alert --syslog --delay --daemonise \
-                        --pid-file --oneshot --test" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options --mail --program
+                        --alert --syslog --delay --daemonise --pid-file
+                        --oneshot --test" -- "$cur" ) )
 
                     ;;
                 /dev/*|--add|--fail|--remove)
-                    COMPREPLY=( $( compgen -W "$options --add --re-add \
+                    COMPREPLY=( $( compgen -W "$options --add --re-add
                         --remove --fail --set-faulty" -- "$cur" ) )
                     ;;
                 *)
-                    COMPREPLY=( $( compgen -W "$options --query --detail \
-                        --examine --sparc2.2 --examine-bitmap --run \
-                        --stop --readonly --readwrite \
-                        --zero-superblock --test" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$options --query --detail
+                        --examine --sparc2.2 --examine-bitmap --run --stop
+                        --readonly --readwrite --zero-superblock --test" \
+                            -- "$cur" ) )
                     ;;
             esac
         fi
diff --git a/completions/mdtool b/completions/mdtool
index 4335886..879dabf 100644
--- a/completions/mdtool
+++ b/completions/mdtool
@@ -42,9 +42,9 @@ _mdtool()
                 ;;
             "setup")
                 # TODO: at least return filenames after these options.
-                COMPREPLY=( $( compgen -W 'install i uninstall u check-install \
-                    ci update up list l list-av la list-update lu rep-add ra \
-                    rep-remove rr rep-update ru rep-list rl reg-update \
+                COMPREPLY=( $( compgen -W 'install i uninstall u check-install
+                    ci update up list l list-av la list-update lu rep-add ra
+                    rep-remove rr rep-update ru rep-list rl reg-update
                     reg-build rgu info rep-build rb pack p help h dump-file' \
                     -- "$cur" ) )
                 return 0
@@ -52,7 +52,7 @@ _mdtool()
         esac
     fi
 
-    COMPREPLY=( $( compgen -W 'gsetup build dbgen project-export \
+    COMPREPLY=( $( compgen -W 'gsetup build dbgen project-export
         generate-makefiles gettext-update setup -q' -- "$cur" ) )
 
     return 0
diff --git a/completions/mii-diag b/completions/mii-diag
index 5e94877..2743d9d 100644
--- a/completions/mii-diag
+++ b/completions/mii-diag
@@ -7,9 +7,8 @@ _mii_diag()
 
     case $prev in
         -F|-A|--advertise|--fixed-speed)
-            COMPREPLY=( $( compgen -W '100baseT4 100baseTx \
-                100baseTx-FD 100baseTx-HD 10baseT 10baseT-FD \
-                10baseT-HD' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '100baseT4 100baseTx 100baseTx-FD
+                100baseTx-HD 10baseT 10baseT-FD 10baseT-HD' -- "$cur" ) )
             return 0
             ;;
     esac
diff --git a/completions/mii-tool b/completions/mii-tool
index effaa1d..facebe4 100644
--- a/completions/mii-tool
+++ b/completions/mii-tool
@@ -7,12 +7,12 @@ _mii_tool()
 
     case $prev in
         -F|--force)
-            COMPREPLY=( $( compgen -W '100baseTx-FD 100baseTx-HD \
-                10baseT-FD 10baseT-HD' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '100baseTx-FD 100baseTx-HD 10baseT-FD
+                10baseT-HD' -- "$cur" ) )
             return 0
             ;;
         -A|--advertise)
-            COMPREPLY=( $( compgen -W '100baseT4 100baseTx-FD 100baseTx-HD \
+            COMPREPLY=( $( compgen -W '100baseT4 100baseTx-FD 100baseTx-HD
                 10baseT-FD 10baseT-HD' -- "$cur" ) )
             return 0
             ;;
diff --git a/completions/minicom b/completions/minicom
index cad9092..d168ce4 100644
--- a/completions/minicom
+++ b/completions/minicom
@@ -24,8 +24,8 @@ _minicom()
 
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-s -o -m -M -z -l -L -w -a -t \
-            -c -S -d -p -C -T -7 -8' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-s -o -m -M -z -l -L -w -a -t -c -S -d -p -C
+            -T -7 -8' -- "$cur" ) )
         return 0
     else
         local confdir
diff --git a/completions/mplayer b/completions/mplayer
index 654a272..88e9dc7 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -224,7 +224,7 @@ _mplayer()
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur" ))
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur" ) )
             return 0
             ;;
         -tv)
diff --git a/completions/msynctool b/completions/msynctool
index db48e1b..28a0163 100644
--- a/completions/msynctool
+++ b/completions/msynctool
@@ -32,10 +32,10 @@ _msynctool()
             ;;
     esac
 
-    COMPREPLY=( $( compgen -W '--listgroups --listplugins --listobjects \
-        --showformats --showgroup --sync --filter-objtype --slow-sync \
-        --wait --multi --addgroup --delgroup --addmember --configure \
-        --manual --configdir --conflict' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W '--listgroups --listplugins --listobjects
+        --showformats --showgroup --sync --filter-objtype --slow-sync --wait
+        --multi --addgroup --delgroup --addmember --configure --manual
+        --configdir --conflict' -- "$cur" ) )
 } &&
 complete -F _msynctool msynctool
 
diff --git a/completions/munin-update b/completions/munin-update
index f92f2f1..c035ec7 100644
--- a/completions/munin-update
+++ b/completions/munin-update
@@ -17,9 +17,9 @@ _munin_update()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--force-root --[no]force-root \
-            --service --host --config --help --debug --nodebug \
-            --fork --nofork --stdout --nostdout --timeout' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--force-root --noforce-root --service --host
+            --config --help --debug --nodebug --fork --nofork --stdout
+            --nostdout --timeout' -- "$cur" ) )
     fi
 } &&
 complete -F _munin_update munin-update
diff --git a/completions/mutt b/completions/mutt
index acab9c8..3dc82a9 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -143,8 +143,8 @@ _mutt()
 
     case $cur in
     -*)
-        COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n \
-            -p -Q -R -s -v -x -y -z -Z -h' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s
+            -v -x -y -z -Z -h' -- "$cur" ) )
         return 0
         ;;
     *)
diff --git a/completions/mysqladmin b/completions/mysqladmin
index fd8c318..bdc07eb 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -42,10 +42,9 @@ _mysqladmin()
 
     COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
 
-    COMPREPLY+=( \
-        $( compgen -W 'create debug drop extended-status flush-hosts \
-        flush-logs flush-status flush-tables flush-threads flush-privileges \
-        kill password old-password ping processlist reload refresh shutdown \
+    COMPREPLY+=( $( compgen -W 'create debug drop extended-status flush-hosts
+        flush-logs flush-status flush-tables flush-threads flush-privileges
+        kill password old-password ping processlist reload refresh shutdown
         status start-slave stop-slave variables version' -- "$cur" ) )
 
     [[ $COMPREPLY == *= ]] && compopt -o nospace
diff --git a/completions/nmap b/completions/nmap
index 421fe09..6fbdb07 100644
--- a/completions/nmap
+++ b/completions/nmap
@@ -25,22 +25,22 @@ _nmap()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-iL -iR --exclude --excludefile -sL -sP \
-            -PN -PS -PA -PU -PY -PE -PP -PM -PO -n -R --dns-servers \
-            --system-dns --traceroute -sS -sT -sA -sW -sM -sU -sN -sF -sX \
-            --scanflags -sI -sY -sZ -sO -b -p -F -r --top-ports --port-ratio \
-            -sV --version-intensity --version-light --version-all \
-            --version-trace -sC --script= --script-args= --script-trace \
-            --script-updatedb -O --osscan-limit --osscan-guess -T0 -T1 -T2 -T3 \
-            -T4 -T5 --min-hostgroup --max-hostgroup --min-parallelism \
-            --max-parallelism --min-rtt-timeout --max-rtt-timeout \
-            --initial-rtt-timeout --max-retries --host-timeout --scan-delay \
-            --max-scan-delay --min-rate --max-rate -f --mtu -D -S -e \
-            --source-port --data-length --ip-options --ttl --spoof-mac \
-            --badsum --adler32 -oN -oX -oS -oG -oA -v -d --reason --open \
-            --packet-trace --iflist --log-errors --append-output --resume \
-            --stylesheet --webxml --no-stylesheet -6 -A --datadir --send-eth \
-            --send-ip --privilege--unprivileged -V -h' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-iL -iR --exclude --excludefile -sL -sP -PN
+            -PS -PA -PU -PY -PE -PP -PM -PO -n -R --dns-servers --system-dns
+            --traceroute -sS -sT -sA -sW -sM -sU -sN -sF -sX --scanflags -sI
+            -sY -sZ -sO -b -p -F -r --top-ports --port-ratio -sV
+            --version-intensity --version-light --version-all --version-trace
+            -sC --script= --script-args= --script-trace --script-updatedb -O
+            --osscan-limit --osscan-guess -T0 -T1 -T2 -T3 -T4 -T5
+            --min-hostgroup --max-hostgroup --min-parallelism --max-parallelism
+            --min-rtt-timeout --max-rtt-timeout --initial-rtt-timeout
+            --max-retries --host-timeout --scan-delay --max-scan-delay
+            --min-rate --max-rate -f --mtu -D -S -e --source-port --data-length
+            --ip-options --ttl --spoof-mac --badsum --adler32 -oN -oX -oS -oG
+            -oA -v -d --reason --open --packet-trace --iflist --log-errors
+            --append-output --resume --stylesheet --webxml --no-stylesheet -6
+            -A --datadir --send-eth --send-ip --privilege--unprivileged -V
+            -h' -- "$cur" ) )
     else
         _known_hosts_real "$cur"
     fi
diff --git a/completions/nmcli b/completions/nmcli
index dc55ebb..00628b4 100644
--- a/completions/nmcli
+++ b/completions/nmcli
@@ -2,33 +2,33 @@
 
 _nmcli_list()
 {
-    COMPREPLY=( $( compgen -W '$1' -- $cur ) )
+    COMPREPLY=( $( compgen -W '$1' -- "$cur" ) )
 }
 
 _nmcli_con_id()
 {
     local IFS=$'\n'
     COMPREPLY=( $( compgen -W "$(nmcli con list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $1 }')" -- $cur ) )
+        tail -n +2 | awk -F ' {2,}' '{print $1 }')" -- "$cur" ) )
 }
 
 _nmcli_con_uuid()
 {
     COMPREPLY=( $( compgen -W "$(nmcli con list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- $cur ) )
+        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur" ) )
 }
 
 _nmcli_ap_ssid()
 {
     local IFS=$'\n'
     COMPREPLY=( $( compgen -W "$(nmcli dev wifi list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $1}')" -- $cur ) )
+        tail -n +2 | awk -F ' {2,}' '{print $1}')" -- "$cur" ) )
 }
 
 _nmcli_ab_bssid()
 {
     COMPREPLY=( $( compgen -W "$(nmcli dev wifi list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- $cur ) )
+        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur" ) )
 }
 
 _nmcli()
@@ -38,11 +38,11 @@ _nmcli()
 
     case $prev in
         -m|--mode)
-            COMPREPLY=( $( compgen -W 'tabular multiline' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'tabular multiline' -- "$cur" ) )
             return 0
             ;;
         -f|--fields)
-            COMPREPLY=( $( compgen -W 'all common' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'all common' -- "$cur" ) )
             return 0
             ;;
         -e|--escape)
@@ -73,10 +73,10 @@ _nmcli()
 
     if [[ $cword -eq 1 ]] ; then
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--terse --pretty --mode --fields \
-                --escape --version --help' -- $cur ) )
+            COMPREPLY=( $( compgen -W '--terse --pretty --mode --fields
+                --escape --version --help' -- "$cur" ) )
         else
-            COMPREPLY=( $( compgen -W "nm con dev" -- $cur ) )
+            COMPREPLY=( $( compgen -W "nm con dev" -- "$cur" ) )
         fi
     else
         local object=${words[1]}
@@ -107,50 +107,50 @@ _nmcli()
                         ;;
                 esac
 
-                COMPREPLY=( $( compgen -W 'status permissions enable sleep \
-                    wifi wwan wimax' -- $cur ) )
+                COMPREPLY=( $( compgen -W 'status permissions enable sleep
+                    wifi wwan wimax' -- "$cur" ) )
                 ;;
             con)
                 case $command in
                     list)
-                        COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) )
+                        COMPREPLY=( $( compgen -W 'id uuid' -- "$cur" ) )
                         return 0
                         ;;
                     up)
                         if [[ "$cur" == -* ]]; then
                             COMPREPLY=( $( compgen -W '--nowait --timeout' \
-                                -- $cur ) )
+                                -- "$cur" ) )
                         else
                             COMPREPLY=( $( compgen -W 'id uuid iface ap nsp' \
-                                -- $cur ) )
+                                -- "$cur" ) )
                         fi
                         return 0
                         ;;
                     down)
-                        COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) )
+                        COMPREPLY=( $( compgen -W 'id uuid' -- "$cur" ) )
                         return 0
                         ;;
                     delete)
-                        COMPREPLY=( $( compgen -W 'id uuid' -- $cur ) )
+                        COMPREPLY=( $( compgen -W 'id uuid' -- "$cur" ) )
                         return 0
                         ;;
                 esac
 
                 COMPREPLY=( $( compgen -W 'list status up down delete' \
-                        -- $cur ) )
+                        -- "$cur" ) )
                 ;;
             dev)
                 case $command in
                     list)
-                        COMPREPLY=( $( compgen -W 'iface' -- $cur ) )
+                        COMPREPLY=( $( compgen -W 'iface' -- "$cur" ) )
                         return 0
                         ;;
                     disconnect)
                         if [[ "$cur" == -* ]]; then
                             COMPREPLY=( $( compgen -W '--nowait --timeout' \
-                                -- $cur ) )
+                                -- "$cur" ) )
                         else
-                            COMPREPLY=( $( compgen -W 'iface' -- $cur ) )
+                            COMPREPLY=( $( compgen -W 'iface' -- "$cur" ) )
                         fi
                         return 0
                         ;;
@@ -160,33 +160,33 @@ _nmcli()
                         case $subcommand in
                             list)
                                 COMPREPLY=( $( compgen -W 'iface bssid' \
-                                    -- $cur ) )
+                                    -- "$cur" ) )
                                 return 0
                                 ;;
                             connect)
                                 if [[ "$cur" == -* ]]; then
-                                    COMPREPLY=( $( compgen -W '--private \
-                                        --nowait --timeout' -- $cur ) )
+                                    COMPREPLY=( $( compgen -W '--private
+                                        --nowait --timeout' -- "$cur" ) )
                                 else
                                     if [[ "$prev" == "connect" ]]; then
                                         _nmcli_ap_ssid
                                     else
-                                        COMPREPLY=( $( compgen -W 'password \
+                                        COMPREPLY=( $( compgen -W 'password
                                             wep-key-type iface bssid name' \
-                                            -- $cur ) )
+                                            -- "$cur" ) )
                                     fi
                                 fi
                                 return 0
                                 ;;
                         esac
 
-                        COMPREPLY=( $( compgen -W 'list connect' -- $cur ) )
+                        COMPREPLY=( $( compgen -W 'list connect' -- "$cur" ) )
                         return 0
                         ;;
                 esac
 
                 COMPREPLY=( $( compgen -W 'status list disconnect wifi' \
-                    -- $cur ) )
+                    -- "$cur" ) )
                 ;;
         esac
 
diff --git a/completions/openssl b/completions/openssl
index b63d215..997fe1e 100644
--- a/completions/openssl
+++ b/completions/openssl
@@ -33,20 +33,17 @@ _openssl()
 
     local commands command options formats
 
-    commands='asn1parse ca ciphers crl crl2pkcs7 dgst dh dhparam dsa \
-        dsaparam ec ecparam enc engine errstr gendh gendsa genrsa \
-        nseq ocsp passwd pkcs12 pkcs7 pkcs8 prime rand req rsa \
-        rsautl s_client s_server s_time sess_id smime speed spkac \
-        verify version x509 md2 md4 md5 rmd160 sha sha1 aes-128-cbc \
-        aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc aes-256-ecb \
-        base64 bf bf-cbc bf-cfb bf-ecb bf-ofb camellia-128-cbc \
-        camellia-128-ecb camellia-192-cbc camellia-192-ecb \
-        camellia-256-cbc camellia-256-ecb cast cast-cbc cast5-cbc \
-        cast5-cfb cast5-ecb cast5-ofb des des-cbc des-cfb des-ecb \
-        des-ede des-ede-cbc des-ede-cfb des-ede-ofb des-ede3 \
-        des-ede3-cbc des-ede3-cfb des-ede3-ofb des-ofb des3 desx rc2 \
-        rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 \
-        rc4-40'
+    commands='asn1parse ca ciphers crl crl2pkcs7 dgst dh dhparam dsa dsaparam
+        ec ecparam enc engine errstr gendh gendsa genrsa nseq ocsp passwd
+        pkcs12 pkcs7 pkcs8 prime rand req rsa rsautl s_client s_server s_time
+        sess_id smime speed spkac verify version x509 md2 md4 md5 rmd160 sha
+        sha1 aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc
+        aes-256-ecb base64 bf bf-cbc bf-cfb bf-ecb bf-ofb camellia-128-cbc
+        camellia-128-ecb camellia-192-cbc camellia-192-ecb camellia-256-cbc
+        camellia-256-ecb cast cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb
+        des des-cbc des-cfb des-ecb des-ede des-ede-cbc des-ede-cfb des-ede-ofb
+        des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb des-ofb des3 desx rc2
+        rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc4-40'
 
     if [[ $cword -eq 1 ]]; then
         COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
@@ -69,7 +66,8 @@ _openssl()
                 _openssl_sections
                 return 0
                 ;;
-            -inform|-outform|-keyform|-certform|-CAform|-CAkeyform|-dkeyform|-dcertform)
+            -inform|-outform|-keyform|-certform|-CAform|-CAkeyform|-dkeyform|\
+            -dcertform)
                 formats='DER PEM'
                 case $command in
                     x509)
@@ -87,8 +85,7 @@ _openssl()
                 return 0
                 ;;
             -starttls)
-                COMPREPLY=( $( compgen -W 'smtp pop3 imap ftp' \
-                    -- "$cur" ) )
+                COMPREPLY=( $( compgen -W 'smtp pop3 imap ftp' -- "$cur" ) )
                 return 0
                 ;;
             -cipher)
@@ -102,48 +99,47 @@ _openssl()
             # possible options for the command
             case $command in
                 asn1parse)
-                    options='-inform -in -out -noout -offset -length -i -oid \
+                    options='-inform -in -out -noout -offset -length -i -oid
                         -strparse'
                     ;;
                 ca)
-                    options='-verbose -config -name -gencrl -revoke \
-                        -crl_reason -crl_hold -crl_compromise \
-                        -crl_CA_compromise -crldays -crlhours -crlexts \
-                        -startdate -enddate -days -md -policy -keyfile -key \
-                        -passin -cert -selfsig -in -out -notext -outdir \
-                        -infiles -spkac -ss_cert -preserveDN -noemailDN \
-                        -batch -msie_hack -extensions -extfile -engine \
-                        -subj -utf8 -multivalue-rdn'
+                    options='-verbose -config -name -gencrl -revoke -crl_reason
+                        -crl_hold -crl_compromise -crl_CA_compromise -crldays
+                        -crlhours -crlexts -startdate -enddate -days -md
+                        -policy -keyfile -key -passin -cert -selfsig -in -out
+                        -notext -outdir -infiles -spkac -ss_cert -preserveDN
+                        -noemailDN -batch -msie_hack -extensions -extfile
+                        -engine -subj -utf8 -multivalue-rdn'
                         ;;
                 ciphers)
                     options='-v -ssl2 -ssl3 -tls1'
                     ;;
                 crl)
-                    options='-inform -outform -text -in -out -noout -hash \
+                    options='-inform -outform -text -in -out -noout -hash
                         -issuer -lastupdate -nextupdate -CAfile -CApath'
                     ;;
                 crl2pkcs7)
                     options='-inform -outform -in -out -print_certs'
                     ;;
                 dgst)
-                    options='-md5 -md4 -md2 -sha1 -sha -mdc2 -ripemd160 -dss1 \
-                        -c -d -hex -binary -out -sign -verify -prverify \
+                    options='-md5 -md4 -md2 -sha1 -sha -mdc2 -ripemd160 -dss1
+                        -c -d -hex -binary -out -sign -verify -prverify
                         -signature'
                     ;;
                 dsa)
-                    options='-inform -outform -in -passin -out -passout -des \
+                    options='-inform -outform -in -passin -out -passout -des
                         -des3 -idea -text -noout -modulus -pubin -pubout'
                     ;;
                 dsaparam)
-                    options='-inform -outform -in -out -noout -text -C -rand \
+                    options='-inform -outform -in -out -noout -text -C -rand
                         -genkey'
                     ;;
                 enc)
-                    options='-ciphername -in -out -pass -e -d -a -A -k -kfile \
+                    options='-ciphername -in -out -pass -e -d -a -A -k -kfile
                         -S -K -iv -p -P -bufsize -debug'
                     ;;
                 dhparam)
-                    options='-inform -outform -in -out -dsaparam -noout -text \
+                    options='-inform -outform -in -out -dsaparam -noout -text
                         -C -2 -5 -rand'
                     ;;
                 gendsa)
@@ -153,75 +149,74 @@ _openssl()
                     options='-out -passout -des -des3 -idea -f4 -3 -rand'
                     ;;
                 pkcs7)
-                    options='-inform -outform -in -out -print_certs -text \
+                    options='-inform -outform -in -out -print_certs -text
                         -noout'
                     ;;
                 rand)
                     options='-out -rand -base64'
                     ;;
                 req)
-                    options='-inform -outform -in -passin -out -passout -text \
-                        -noout -verify -modulus -new -rand -newkey -newkey \
-                        -nodes -key -keyform -keyout -md5 -sha1 -md2 -mdc2 \
-                        -config -x509 -days -asn1-kludge -newhdr -extensions \
+                    options='-inform -outform -in -passin -out -passout -text
+                        -noout -verify -modulus -new -rand -newkey -newkey
+                        -nodes -key -keyform -keyout -md5 -sha1 -md2 -mdc2
+                        -config -x509 -days -asn1-kludge -newhdr -extensions
                         -reqexts section'
                     ;;
                 rsa)
-                    options='-inform -outform -in -passin -out -passout \
-                        -sgckey -des -des3 -idea -text -noout -modulus -check \
+                    options='-inform -outform -in -passin -out -passout
+                        -sgckey -des -des3 -idea -text -noout -modulus -check
                         -pubin -pubout -engine'
                     ;;
                 rsautl)
-                    options='-in -out -inkey -pubin -certin -sign -verify \
+                    options='-in -out -inkey -pubin -certin -sign -verify
                         -encrypt -decrypt -pkcs -ssl -raw -hexdump -asn1parse'
                     ;;
                 s_client)
-                    options='-connect -verify -cert -certform -key -keyform \
-                        -pass -CApath -CAfile -reconnect -pause -showcerts \
-                        -debug -msg -nbio_test -state -nbio -crlf -ign_eof \
-                        -quiet -ssl2 -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 \
-                        -bugs -cipher -starttls -engine -tlsextdebug \
+                    options='-connect -verify -cert -certform -key -keyform
+                        -pass -CApath -CAfile -reconnect -pause -showcerts
+                        -debug -msg -nbio_test -state -nbio -crlf -ign_eof
+                        -quiet -ssl2 -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1
+                        -bugs -cipher -starttls -engine -tlsextdebug
                         -no_ticket -sess_out -sess_in -rand'
                     ;;
                 s_server)
-                    options='-accept -context -verify -Verify -crl_check \
-                        -crl_check_all -cert -certform -key -keyform -pass \
-                        -dcert -dcertform -dkey -dkeyform -dpass -dhparam \
-                        -nbio -nbio_test -crlf -debug -msg -state -CApath \
-                        -CAfile -nocert -cipher -quiet -no_tmp_rsa -ssl2 \
-                        -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 -no_dhe \
-                        -bugs -hack -www -WWW -HTTP -engine -tlsextdebug \
+                    options='-accept -context -verify -Verify -crl_check
+                        -crl_check_all -cert -certform -key -keyform -pass
+                        -dcert -dcertform -dkey -dkeyform -dpass -dhparam
+                        -nbio -nbio_test -crlf -debug -msg -state -CApath
+                        -CAfile -nocert -cipher -quiet -no_tmp_rsa -ssl2
+                        -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 -no_dhe
+                        -bugs -hack -www -WWW -HTTP -engine -tlsextdebug
                         -no_ticket -id_prefix -rand'
                     ;;
                 s_time)
-                    options='-connect -www -cert -key -CApath -CAfile -reuse \
+                    options='-connect -www -cert -key -CApath -CAfile -reuse
                         -new -verify -nbio -time -ssl2 -ssl3 -bugs -cipher'
                     ;;
                 sess_id)
-                    options='-inform -outform -in -out -text -noout -context \
-                        ID'
+                    options='-inform -outform -in -out -text -noout -context ID'
                     ;;
                 smime)
-                    options='-encrypt -decrypt -sign -verify -pk7out -des \
-                        -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 \
-                        -in -certfile -signer -recip -inform -passin -inkey \
-                        -out -outform -content -to -from -subject -text -rand'
+                    options='-encrypt -decrypt -sign -verify -pk7out -des -des3
+                        -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 -in
+                        -certfile -signer -recip -inform -passin -inkey -out
+                        -outform -content -to -from -subject -text -rand'
                     ;;
                 speed)
                     options='-engine'
                     ;;
                 verify)
-                    options='-CApath -CAfile -purpose -untrusted -help \
+                    options='-CApath -CAfile -purpose -untrusted -help
                         -issuer_checks -verbose -certificates'
                     ;;
                 x509)
-                    options='-inform -outform -keyform -CAform -CAkeyform -in \
-                        -out -serial -hash -subject_hash -issuer_hash -subject \
-                        -issuer -nameopt -email -startdate -enddate -purpose \
-                        -dates -modulus -fingerprint -alias -noout -trustout \
-                        -clrtrust -clrreject -addtrust -addreject -setalias \
-                        -days -set_serial -signkey -x509toreq -req -CA -CAkey \
-                        -CAcreateserial -CAserial -text -C -md2 -md5 -sha1 \
+                    options='-inform -outform -keyform -CAform -CAkeyform -in
+                        -out -serial -hash -subject_hash -issuer_hash -subject
+                        -issuer -nameopt -email -startdate -enddate -purpose
+                        -dates -modulus -fingerprint -alias -noout -trustout
+                        -clrtrust -clrreject -addtrust -addreject -setalias
+                        -days -set_serial -signkey -x509toreq -req -CA -CAkey
+                        -CAcreateserial -CAserial -text -C -md2 -md5 -sha1
                         -mdc2 -clrext -extfile -extensions -engine'
                     ;;
                 md5|md4|md2|sha1|sha|mdc2|ripemd160)
@@ -231,9 +226,9 @@ _openssl()
             COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
         else
             if [[ "$command" == speed ]]; then
-                COMPREPLY=( $( compgen -W 'md2 mdc2 md5 hmac sha1 rmd160 \
-                    idea-cbc rc2-cbc rc5-cbc bf-cbc des-cbc des-ede3 rc4 \
-                    rsa512 rsa1024 rsa2048 rsa4096 dsa512 dsa1024 dsa2048 idea \
+                COMPREPLY=( $( compgen -W 'md2 mdc2 md5 hmac sha1 rmd160
+                    idea-cbc rc2-cbc rc5-cbc bf-cbc des-cbc des-ede3 rc4
+                    rsa512 rsa1024 rsa2048 rsa4096 dsa512 dsa1024 dsa2048 idea
                     rc2 des rsa blowfish' -- "$cur" ) )
             else
                 _filedir
diff --git a/completions/p4 b/completions/p4
index d0d984b..4e47267 100644
--- a/completions/p4
+++ b/completions/p4
@@ -19,9 +19,9 @@ _p4()
     elif [[ $cword -eq 2 ]]; then
         case $prev in
             help)
-                COMPREPLY=( $( compgen -W "simple commands \
-                    environment filetypes jobview revisions \
-                    usage views $p4commands" -- "$cur" ) )
+                COMPREPLY=( $( compgen -W "simple commands environment
+                    filetypes jobview revisions usage views $p4commands" \
+                        -- "$cur" ) )
                 ;;
             admin)
                 COMPREPLY=( $( compgen -W "checkpoint stop" -- "$cur" ) )
@@ -34,7 +34,7 @@ _p4()
             -t)
                 case ${words[$cword-2]} in
                     add|edit|reopen)
-                        COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
+                        COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur" ) )
                         ;;
                     *)
                         ;;
diff --git a/completions/pack200 b/completions/pack200
index 6be2dc8..fa6b1c7 100644
--- a/completions/pack200
+++ b/completions/pack200
@@ -55,13 +55,12 @@ _pack200()
 
     if ! $pack ; then
         if [[ "$cur" == -* ]] ; then
-            COMPREPLY=( $( compgen -W '--no-gzip --gzip --strip-debug \
-                --no-keep-file-order --segment-limit= --effort= \
-                --deflate-hint= --modification-time= --pass-file= \
-                --unknown-attribute= --class-attribute= --field-attribute= \
-                --method-attribute= --code-attribute= --config-file= \
-                --verbose --quiet --log-file= --help --version -J \
-                --repack' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--no-gzip --gzip --strip-debug
+                --no-keep-file-order --segment-limit= --effort= --deflate-hint=
+                --modification-time= --pass-file= --unknown-attribute=
+                --class-attribute= --field-attribute= --method-attribute=
+                --code-attribute= --config-file= --verbose --quiet --log-file=
+                --help --version -J --repack' -- "$cur" ) )
             [[ $COMPREPLY == *= ]] && compopt -o nospace
         else
             _filedir 'pack?(.gz)'
diff --git a/completions/perl b/completions/perl
index 8b29637..4bcc9b0 100644
--- a/completions/perl
+++ b/completions/perl
@@ -73,8 +73,8 @@ _perl()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d \
-            -D -p -n -a -F -l -0 -I -m -M -P -S -x -i -e ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
+            -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur" ) )
     else
         _filedir
     fi
diff --git a/completions/pkgtool b/completions/pkgtool
index f7291db..5adcbaf 100644
--- a/completions/pkgtool
+++ b/completions/pkgtool
@@ -25,7 +25,7 @@ _pkgtool()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \
+        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile
             --source-mounted --source_dir --target_dir --source_device' \
             -- "$cur" ) )
         return 0
diff --git a/completions/postfix b/completions/postfix
index 7eefccb..b74bcaf 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -21,7 +21,7 @@ _postfix()
         return 0
     fi
 
-    COMPREPLY=( $( compgen -W 'check start stop abort flush reload status \
+    COMPREPLY=( $( compgen -W 'check start stop abort flush reload status
         set-permissions upgrade-configuration' -- "$cur" ) )
 } &&
 complete -F _postfix postfix
diff --git a/completions/puppet b/completions/puppet
index bb58aad..f24917a 100644
--- a/completions/puppet
+++ b/completions/puppet
@@ -95,7 +95,7 @@ _puppet()
                    command=apply
                    ;;
                *)
-                  COMPREPLY=( $( compgen -W 'agent apply cert describe doc \
+                  COMPREPLY=( $( compgen -W 'agent apply cert describe doc
                       filebucket kick master queue resource' -- "$cur" ) )
                   return 0
                   ;;
@@ -114,7 +114,7 @@ _puppet()
                     ;;
                 --serve)
                     # From /usr/lib/ruby/1.8/puppet/network/handler/
-                    COMPREPLY=( $( compgen -W 'ca filebucket fileserver master \
+                    COMPREPLY=( $( compgen -W 'ca filebucket fileserver master
                         report runner status' -- "$cur" ) )
                     return 0
                     ;;
@@ -127,10 +127,10 @@ _puppet()
                     return 0
                     ;;
                 *)
-                    COMPREPLY=( $( compgen -W '--daemonize --no-daemonize \
-                        --debug --detailed-exitcodes --disable --enable \
-                        --help --fqdn --logdest --onetime --serve --test \
-                        --noop --digest --fingerprint --version --verbose \
+                    COMPREPLY=( $( compgen -W '--daemonize --no-daemonize
+                        --debug --detailed-exitcodes --disable --enable --help
+                        --fqdn --logdest --onetime --serve --test --noop
+                        --digest --fingerprint --version --verbose
                         --waitforcert --no-client' -- "$cur" ) )
                     return 0
             esac
@@ -143,8 +143,8 @@ _puppet()
                     ;;
                 *)
                     if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--help --version --debug \
-                            --verbose --execute --detailed-exitcodes \
+                        COMPREPLY=( $( compgen -W '--help --version --debug
+                            --verbose --execute --detailed-exitcodes
                             --logdest' -- "$cur" ) )
                     else
                         _filedir
@@ -182,8 +182,8 @@ _puppet()
                             return 0
                             ;;
                         *)
-                            COMPREPLY=( $( compgen -W '--clean --generate \
-                                --help --list --print --fingerprint --revoke \
+                            COMPREPLY=( $( compgen -W '--clean --generate
+                                --help --list --print --fingerprint --revoke
                                 --sign --version --verify' -- "$cur" ) )
                             return 0
                     esac
@@ -191,7 +191,7 @@ _puppet()
             ;;
         describe)
             if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W '--help --short --providers --list \
+                COMPREPLY=( $( compgen -W '--help --short --providers --list
                     --meta' -- "$cur" ) )
             else
                 _puppet_types
@@ -214,7 +214,7 @@ _puppet()
                     ;;
                 *)
                     if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--all --help --outputdir \
+                        COMPREPLY=( $( compgen -W '--all --help --outputdir
                             --mode --reference --charset --list' -- "$cur" ) )
                     else
                         _filedir
@@ -234,9 +234,9 @@ _puppet()
                     ;;
                 *)
                     if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--help --version --debug \
+                        COMPREPLY=( $( compgen -W '--help --version --debug
                             --verbose --local --remote --server --bucket' \
-                            -- "$cur" ) )
+                                -- "$cur" ) )
                     else
                         COMPREPLY=( $( compgen -W 'backup get restore' \
                             -- "$cur" ) )
@@ -259,8 +259,8 @@ _puppet()
                     ;;
                 *)
                     if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--all --class --debug \
-                            --foreground --help --host --no-fqdn \
+                        COMPREPLY=( $( compgen -W '--all --class --debug
+                            --foreground --help --host --no-fqdn
                             --ignoreschedules --tag --test --ping' -- "$cur" ) )
                     else
                         _known_hosts_real "$cur"
@@ -275,9 +275,9 @@ _puppet()
                     return 0
                     ;;
                 *)
-                    COMPREPLY=( $( compgen -W '--daemonize --no-daemonize \
+                    COMPREPLY=( $( compgen -W '--daemonize --no-daemonize
                         --debug --help --logdest --verbose --version' \
-                        -- "$cur" ) )
+                            -- "$cur" ) )
                     return 0
             esac
             ;;
@@ -289,8 +289,8 @@ _puppet()
                     ;;
                 *)
                     if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--help --version --debug \
-                            --verbose --execute --detailed-exitcodes \
+                        COMPREPLY=( $( compgen -W '--help --version --debug
+                            --verbose --execute --detailed-exitcodes
                             --logdest' -- "$cur" ) )
                     else
                         _filedir
diff --git a/completions/qemu b/completions/qemu
index 45a48b9..3899715 100644
--- a/completions/qemu
+++ b/completions/qemu
@@ -20,9 +20,9 @@ _qemu()
             return 0
             ;;
         -k)
-            COMPREPLY=( $( compgen -W 'ar de-ch es fo fr-ca hu ja \
-                mk no pt-br sv da en-gb et fr fr-ch is lt nl pl\
-                ru th de en-us fi fr-be hr it lv nl-be pt sl tr' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
+                sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr
+                it lv nl-be pt sl tr' -- "$cur" ) )
             return 0
             ;;
         -soundhw)
@@ -41,8 +41,8 @@ _qemu()
             return 0
             ;;
         -usbdevice)
-            COMPREPLY=( $( compgen -W 'mouse tablet disk: host: \
-                serial: braille net' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'mouse tablet disk: host: serial: braille
+                net' -- "$cur" ) )
             return 0
             ;;
         -net)
@@ -51,9 +51,8 @@ _qemu()
             return 0
             ;;
         -serial|-parallel|-monitor)
-            COMPREPLY=( $( compgen -W 'vc pty none null /dev/ \
-                file: stdio pipe: COM udp: tcp: telnet: unix: \
-                mon: braille' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'vc pty none null /dev/ file: stdio pipe:
+                COM udp: tcp: telnet: unix: mon: braille' -- "$cur" ) )
             return 0
             ;;
         -redir)
@@ -70,8 +69,8 @@ _qemu()
             return 0
             ;;
         -drive)
-            COMPREPLY=( $( compgen -S"=" -W 'file if bus unit index media \
-                cyls snapshot cache format serial addr' -- "$cur" ) )
+            COMPREPLY=( $( compgen -S"=" -W 'file if bus unit index media cyls
+                snapshot cache format serial addr' -- "$cur" ) )
             return 0
             ;;
         -ballon)
@@ -88,7 +87,7 @@ _qemu()
             return 0
             ;;
         -watchdog-action)
-            COMPREPLY=( $( compgen -W 'reset shutdown poweroff pause debug \
+            COMPREPLY=( $( compgen -W 'reset shutdown poweroff pause debug
                 none' -- "$cur" ) )
             return 0
             ;;
diff --git a/completions/qrunner b/completions/qrunner
index 3fe5f81..d92c011 100644
--- a/completions/qrunner
+++ b/completions/qrunner
@@ -8,8 +8,8 @@ _qrunner()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--runner --once \
-            --list --verbose --subproc --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--runner --once --list --verbose --subproc
+            --help' -- "$cur" ) )
     fi
 
 } &&
diff --git a/completions/querybts b/completions/querybts
index a973f74..9e28887 100644
--- a/completions/querybts
+++ b/completions/querybts
@@ -8,27 +8,25 @@ _querybts()
     case $prev in
         -B|--bts)
             COMPREPLY=( $( compgen -W "debian guug kde mandrake help" \
-                -- "$cur" ))
+                -- "$cur" ) )
             return 0
             ;;
         -u|--ui|--interface)
-            COMPREPLY=($( compgen -W "newt text gnome" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "newt text gnome" -- "$cur" ) )
             return 0
             ;;
     esac
 
     $split && return 0
 
-    COMPREPLY=($( compgen -W '-h --help -v --version -A --archive \
-        -B --bts -l --ldap --no-ldap --proxy --http_proxy \
-        -s --source -w --web -u --ui --interface \
-        wnpp boot-floppies kernel bugs.debian.org \
-        cdimage.debian.org general installation-reports \
-        listarchives lists.debian.org mirrors nm.debian.org \
-        press project qa.debian.org release-notes \
-        security.debian.org tech-ctte upgrade-reports \
-        www.debian.org' -- "$cur" ) \
-        $( apt-cache pkgnames -- "$cur" 2> /dev/null) )
+    COMPREPLY=( $( compgen -W '-h --help -v --version -A --archive -B --bts -l
+        --ldap --no-ldap --proxy --http_proxy -s --source -w --web -u --ui
+        --interface \
+        wnpp boot-floppies kernel bugs.debian.org cdimage.debian.org general
+        installation-reports listarchives lists.debian.org mirrors
+        nm.debian.org press project qa.debian.org release-notes
+        security.debian.org tech-ctte upgrade-reports www.debian.org' \
+            -- "$cur" ) $( apt-cache pkgnames -- "$cur" 2> /dev/null ) )
 } &&
 complete -F _querybts querybts
 
diff --git a/completions/rdesktop b/completions/rdesktop
index 48a9175..50273f2 100644
--- a/completions/rdesktop
+++ b/completions/rdesktop
@@ -32,7 +32,7 @@ _rdesktop()
                 *:*)
                     ;;
                 *)
-                    COMPREPLY=( $( compgen -W 'comport: disk: lptport: \
+                    COMPREPLY=( $( compgen -W 'comport: disk: lptport:
                         printer: sound: lspci scard' -- "$cur" ) )
                     [[ $COMPREPLY == *: ]] && compopt -o nospace
                     ;;
diff --git a/completions/remove_members b/completions/remove_members
index 4e45938..5003fca 100644
--- a/completions/remove_members
+++ b/completions/remove_members
@@ -15,7 +15,7 @@ _remove_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--file --all --fromall --nouserack \
+        COMPREPLY=( $( compgen -W '--file --all --fromall --nouserack
             --noadminack --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
diff --git a/completions/reportbug b/completions/reportbug
index aa5ac3e..83be47f 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -12,11 +12,11 @@ _reportbug()
             ;;
         -B|--bts)
             COMPREPLY=( $( compgen -W "debian guug kde mandrake help" -- \
-                "$cur" ))
+                "$cur" ) )
             return 0
             ;;
         -e|--editor|--mua)
-            words=(words[0] "$cur")
+            words=( words[0] "$cur" )
             cword=1
             _command
             return 0
@@ -26,8 +26,8 @@ _reportbug()
             return 0
             ;;
         -S|--severity)
-            COMPREPLY=( $( compgen -W "grave serious important normal \
-                minor wishlist" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "grave serious important normal minor
+                wishlist" -- "$cur" ) )
             return 0
             ;;
         -u|--ui|--interface)
@@ -39,12 +39,11 @@ _reportbug()
             return 0
             ;;
         -T|--tag)
-            COMPREPLY=( $( compgen -W "none \
-                woody potato sarge sarge-ignore etch etch-ignore \
-                lenny lenny-ignore sid experimental confirmed \
-                d-i fixed fixed-in-experimental fixed-upstream \
-                help l10n moreinfo patch pending security \
-                unreproducible upstream wontfix ipv6 lfs" -- "$cur" ))
+            COMPREPLY=( $( compgen -W "none woody potato sarge sarge-ignore
+                etch etch-ignore lenny lenny-ignore sid experimental confirmed
+                d-i fixed fixed-in-experimental fixed-upstream help l10n
+                moreinfo patch pending security unreproducible upstream wontfix
+                ipv6 lfs" -- "$cur" ) )
             return 0
             ;;
         --from-buildd)
@@ -56,28 +55,25 @@ _reportbug()
             ;;
     esac
 
-    COMPREPLY=($( compgen -W '--help --version --attach \
-        --no-query-bts --query-bts --bts --body --body-file --bodyfile \
-        --no-config-files --class --configure --check-available --debug \
-        --no-check-available --debconf --test --draftpath --editor --email \
-        --exit-prompt --filename --from-buildd --gnupg --gpg --path --gnus \
-        --header --include --no-check-installed --check-installed \
-        --justification --kudos --keyid --license --list-cc \
-        --maintonly --mirror --mode --mua --mta --mutt --mh --nmh \
-        --bugnumber --no-bug-script --no-cc-menu --output --offline \
-        --print --paranoid --no-paranoid --pgp --proxy --http_proxy \
-        --pseudo-header --quiet --query-only --query-source --no-query-source \
-        --realname --report-quiet --reply-to --replyto --subject --severity \
-        --smtphost --timeout --tls --smtpuser --smtppasswd --src --source --type \
-        --tag --template --verify --no-verify --no-cc --package-version \
-        --no-compress --ui --interface \
-        wnpp boot-floppies kernel bugs.debian.org \
-        cdimage.debian.org general installation-reports \
-        listarchives lists.debian.org mirrors nm.debian.org \
-        press project qa.debian.org release-notes \
-        security.debian.org tech-ctte upgrade-reports \
-        www.debian.org' -- "$cur" ) \
-        $( apt-cache pkgnames -- "$cur" 2> /dev/null) )
+    COMPREPLY=($( compgen -W '--help --version --attach --no-query-bts
+        --query-bts --bts --body --body-file --bodyfile --no-config-files
+        --class --configure --check-available --debug --no-check-available
+        --debconf --test --draftpath --editor --email --exit-prompt --filename
+        --from-buildd --gnupg --gpg --path --gnus --header --include
+        --no-check-installed --check-installed --justification --kudos --keyid
+        --license --list-cc --maintonly --mirror --mode --mua --mta --mutt --mh
+        --nmh --bugnumber --no-bug-script --no-cc-menu --output --offline
+        --print --paranoid --no-paranoid --pgp --proxy --http_proxy
+        --pseudo-header --quiet --query-only --query-source --no-query-source
+        --realname --report-quiet --reply-to --replyto --subject --severity
+        --smtphost --timeout --tls --smtpuser --smtppasswd --src --source
+        --type --tag --template --verify --no-verify --no-cc --package-version
+        --no-compress --ui --interface
+        wnpp boot-floppies kernel bugs.debian.org cdimage.debian.org general
+        installation-reports listarchives lists.debian.org mirrors
+        nm.debian.org press project qa.debian.org release-notes
+        security.debian.org tech-ctte upgrade-reports www.debian.org' \
+            -- "$cur" ) $( apt-cache pkgnames -- "$cur" 2> /dev/null ) )
     _filedir
     return 0
 } &&
diff --git a/completions/rpm b/completions/rpm
index b7b59e0..a66534a 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -52,11 +52,11 @@ _rpm()
         # first parameter on line
         case $cur in
             --*)
-                COMPREPLY=( $( compgen -W '--help --version --initdb \
-                    --checksig --addsign --delsign --rebuilddb --showrc \
-                    --setperms --setugids --eval --install --upgrade --query \
+                COMPREPLY=( $( compgen -W '--help --version --initdb
+                    --checksig --addsign --delsign --rebuilddb --showrc
+                    --setperms --setugids --eval --install --upgrade --query
                     --freshen --erase --verify --querytags --import' \
-                    -- "$cur" ) )
+                        -- "$cur" ) )
                 ;;
             *)
                 COMPREPLY=( $( compgen -W '-e -E -F -i -q -t -U -V' \
@@ -122,45 +122,43 @@ _rpm()
     $split && return 0
 
     # options common to all modes
-    local opts="--define= --eval= --macros= --nodigest --nosignature \
-        --rcfile= --quiet --pipe --verbose"
+    local opts="--define= --eval= --macros= --nodigest --nosignature --rcfile=
+        --quiet --pipe --verbose"
 
     case ${words[1]} in
         -[iFU]*|--install|--freshen|--upgrade)
             if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W "$opts --percent --force \
-                --test --replacepkgs --replacefiles --root \
-                --excludedocs --includedocs --noscripts --ignorearch \
-                --dbpath --prefix= --ignoreos --nodeps --allfiles \
-                --ftpproxy --ftpport --justdb --httpproxy --httpport \
-                --noorder --relocate= --badreloc --notriggers \
-                --excludepath= --ignoresize --oldpackage \
-                --queryformat --repackage --nosuggests" -- "$cur" ) )
+                COMPREPLY=( $( compgen -W "$opts --percent --force --test
+                --replacepkgs --replacefiles --root --excludedocs --includedocs
+                --noscripts --ignorearch --dbpath --prefix= --ignoreos --nodeps
+                --allfiles --ftpproxy --ftpport --justdb --httpproxy --httpport
+                --noorder --relocate= --badreloc --notriggers --excludepath=
+                --ignoresize --oldpackage --queryformat --repackage
+                --nosuggests" -- "$cur" ) )
             else
                 _filedir '[rs]pm'
             fi
             ;;
         -e|--erase)
             if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W "$opts --allmatches \
-                --noscripts --notriggers --nodeps --test --repackage" \
-                -- "$cur" ) )
+                COMPREPLY=( $( compgen -W "$opts --allmatches --noscripts
+                    --notriggers --nodeps --test --repackage" -- "$cur" ) )
             else
                 _rpm_installed_packages $1
             fi
             ;;
         -q*|--query)
             # options common to all query types
-            opts+=" --changelog --configfiles --conflicts --docfiles
-                --dump --enhances --filesbypkg --filecaps --fileclass
-                --filecolor --fileprovide --filerequire --filesbypkg --info
-                --list --obsoletes --pipe --provides --queryformat=
-                --requires --scripts --suggests --triggers --xml"
+            opts+=" --changelog --configfiles --conflicts --docfiles --dump
+                --enhances --filesbypkg --filecaps --fileclass --filecolor
+                --fileprovide --filerequire --filesbypkg --info --list
+                --obsoletes --pipe --provides --queryformat= --requires
+                --scripts --suggests --triggers --xml"
 
             if [[ ${words[@]} == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
                 if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
+                    COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext
                         --last --root --state" -- "$cur" ) )
                 else
                     _filedir
@@ -171,7 +169,7 @@ _rpm()
             elif [[ ${words[@]} == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
                 if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
+                    COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy
                         --httpport --httpproxy --nomanifest" -- "$cur" ) )
                 else
                     _filedir '[rs]pm'
@@ -199,9 +197,9 @@ _rpm()
             ;;
         -[Vy]*|--verify)
             if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $( compgen -W "$opts --root= --dbpath --nodeps \
-                    --nogroup --nolinkto --nomode --nomtime --nordev --nouser \
-                    --nofiles --noscripts --nomd5 --querytags --specfile \
+                COMPREPLY=( $( compgen -W "$opts --root= --dbpath --nodeps
+                    --nogroup --nolinkto --nomode --nomtime --nordev --nouser
+                    --nofiles --noscripts --nomd5 --querytags --specfile
                     --whatrequires --whatprovides" -- "$cur" ) )
             # check whether we're doing file completion
             elif [[ ${words[@]} == *\ -@(*([^ -])f|-file )* ]]; then
diff --git a/completions/rpmcheck b/completions/rpmcheck
index 5c3d16f..dce7319 100644
--- a/completions/rpmcheck
+++ b/completions/rpmcheck
@@ -13,8 +13,8 @@ _rpmcheck()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-explain -failures -successes \
-            -dump -dump-all -base -help -compressed-input' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-explain -failures -successes -dump
+            -dump-all -base -help -compressed-input' -- "$cur" ) )
     else
         _filedir
     fi
diff --git a/completions/rrdtool b/completions/rrdtool
index 8170c9f..c7d2bd2 100644
--- a/completions/rrdtool
+++ b/completions/rrdtool
@@ -6,7 +6,7 @@ _rrdtool ()
     _init_completion || return
 
     if [[ ${#words[@]} -eq 2 ]]; then
-        COMPREPLY=( $( compgen -W 'create update updatev graph dump restore \
+        COMPREPLY=( $( compgen -W 'create update updatev graph dump restore
             last lastupdate first info fetch tune resize xport' -- "$cur" ) )
     else
         _filedir rrd
diff --git a/completions/rsync b/completions/rsync
index e3f0f10..04e1cda 100644
--- a/completions/rsync
+++ b/completions/rsync
@@ -36,33 +36,32 @@ _rsync()
 
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--verbose --quiet --no-motd --checksum \
-                --archive --recursive --relative --no-implied-dirs \
-                --backup --backup-dir= --suffix= --update --inplace --append \
-                --append-verify --dirs --old-dirs --links --copy-links \
-                --copy-unsafe-links --safe-links --copy-dirlinks \
-                --keep-dirlinks --hard-links --perms --executability --chmod= \
-                --acls --xattrs --owner --group --devices --copy-devices \
-                --specials --times --omit-dir-times --super --fake-super \
-                --sparse --dry-run --whole-file --no-whole-file \
-                --one-file-system --block-size= --rsh= --rsync-path= \
-                --existing --ignore-existing --remove-source-files --delete \
-                --delete-before --delete-during --delete-delay --delete-after \
-                --delete-excluded --ignore-errors --force --max-delete= \
-                --max-size= --min-size= --partial --partial-dir= \
-                --delay-updates --prune-empty-dirs --numeric-ids --timeout= \
-                --contimeout= --ignore-times --size-only --modify-window= \
-                --temp-dir= --fuzzy --compare-dest= --copy-dest= --link-dest= \
-                --compress --compress-level= --skip-compress= --cvs-exclude \
-                --filter= --exclude= --exclude-from= --include= \
-                --include-from= --files-from= --from0 --protect-args \
-                --address= --port= --sockopts= --blocking-io --no-blocking-io \
-                --stats --8-bit-output --human-readable --progress \
-                --itemize-changes --out-format= --log-file= \
-                --log-file-format= --password-file= --list-only --bwlimit= \
-                --write-batch= --only-write-batch= --read-batch= --protocol= \
-                --iconv= --ipv4 --ipv6 --version --help --daemon --config= \
-                --no-detach' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--verbose --quiet --no-motd --checksum
+                --archive --recursive --relative --no-implied-dirs
+                --backup --backup-dir= --suffix= --update --inplace --append
+                --append-verify --dirs --old-dirs --links --copy-links
+                --copy-unsafe-links --safe-links --copy-dirlinks
+                --keep-dirlinks --hard-links --perms --executability --chmod=
+                --acls --xattrs --owner --group --devices --copy-devices
+                --specials --times --omit-dir-times --super --fake-super
+                --sparse --dry-run --whole-file --no-whole-file
+                --one-file-system --block-size= --rsh= --rsync-path=
+                --existing --ignore-existing --remove-source-files --delete
+                --delete-before --delete-during --delete-delay --delete-after
+                --delete-excluded --ignore-errors --force --max-delete=
+                --max-size= --min-size= --partial --partial-dir=
+                --delay-updates --prune-empty-dirs --numeric-ids --timeout=
+                --contimeout= --ignore-times --size-only --modify-window=
+                --temp-dir= --fuzzy --compare-dest= --copy-dest= --link-dest=
+                --compress --compress-level= --skip-compress= --cvs-exclude
+                --filter= --exclude= --exclude-from= --include= --include-from=
+                --files-from= --from0 --protect-args --address= --port=
+                --sockopts= --blocking-io --no-blocking-io --stats
+                --8-bit-output --human-readable --progress --itemize-changes
+                --out-format= --log-file= --log-file-format= --password-file=
+                --list-only --bwlimit= --write-batch= --only-write-batch=
+                --read-batch= --protocol= --iconv= --ipv4 --ipv6 --version
+                --help --daemon --config= --no-detach' -- "$cur" ) )
             [[ $COMPREPLY == *= ]] || compopt +o nospace
             ;;
         *:*)
diff --git a/completions/sbopkg b/completions/sbopkg
index 598cb8c..f658910 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -24,7 +24,7 @@ _sbopkg()
             return
             ;;
         -V)
-            COMPREPLY=( $( compgen -W "? \
+            COMPREPLY=( $( compgen -W "?
                 $( sbopkg -V ? 2>&1 | cut -s -f1 )" -- "$cur" ) )
             return
             ;;
diff --git a/completions/screen b/completions/screen
index 7132d06..1ba1b24 100644
--- a/completions/screen
+++ b/completions/screen
@@ -84,8 +84,8 @@ _screen()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-a -A -c -d -D -e -f -fn -fa -h -i -ln \
-            -list -L -m -O -p -q -r -R -s -S -t -T -U -v -wipe -x -X --help \
+        COMPREPLY=( $( compgen -W '-a -A -c -d -D -e -f -fn -fa -h -i -ln -list
+            -L -m -O -p -q -r -R -s -S -t -T -U -v -wipe -x -X --help
             --version' -- "$cur" ) )
     fi
 } &&
diff --git a/completions/smartctl b/completions/smartctl
index 8461c98..bc0d0c0 100644
--- a/completions/smartctl
+++ b/completions/smartctl
@@ -29,8 +29,8 @@ _smartctl_device()
 }
 _smartctl_tolerance()
 {
-    COMPREPLY=( $( compgen -W 'normal conservative permissive \
-        verypermissive' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W 'normal conservative permissive verypermissive' \
+        -- "$cur" ) )
 }
 _smartctl_badsum()
 {
@@ -56,10 +56,10 @@ _smartctl_log()
 }
 _smartctl_vendorattribute()
 {
-    COMPREPLY=( $( compgen -W 'help 9,minutes 9,seconds 9,halfminutes \
-                9,temp 192,emergencyretractcyclect 193,loadunload \
-                194,10xCelsius 194,unknown 198,offlinescanuncsectorct \
-                200,writeerrorcount 201,detectedtacount 220,temp' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W 'help 9,minutes 9,seconds 9,halfminutes 9,temp
+        192,emergencyretractcyclect 193,loadunload 194,10xCelsius 194,unknown
+        198,offlinescanuncsectorct 200,writeerrorcount 201,detectedtacount
+        220,temp' -- "$cur" ) )
 }
 _smartctl_firmwarebug()
 {
diff --git a/completions/smbclient b/completions/smbclient
index b737190..fe14f94 100644
--- a/completions/smbclient
+++ b/completions/smbclient
@@ -17,7 +17,7 @@ _samba_hosts()
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
         COMPREPLY=( $( compgen -W "$( smbtree -N -S | \
             sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- $cur ) )
+            )" -- "$cur" ) )
     fi
 }
 
diff --git a/completions/ssh b/completions/ssh
index 3531c16..ebd7424 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -2,16 +2,15 @@
 
 _ssh_ciphers()
 {
-    COMPREPLY+=( $( compgen -W '3des-cbc aes128-cbc \
-        aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr arcfour128 \
-        arcfour256 arcfour blowfish-cbc cast128-cbc' -- "$cur" ) )
+    COMPREPLY+=( $( compgen -W '3des-cbc aes128-cbc aes192-cbc aes256-cbc
+        aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
+        blowfish-cbc cast128-cbc' -- "$cur" ) )
 }
 
 _ssh_macs()
 {
-    COMPREPLY+=( $( compgen -W 'hmac-md5 hmac-sha1 \
-        umac-64 at openssh.com hmac-ripemd160 hmac-sha1-96 hmac-md5-96' \
-        -- "$cur" ) )
+    COMPREPLY+=( $( compgen -W 'hmac-md5 hmac-sha1 umac-64 at openssh.com
+        hmac-ripemd160 hmac-sha1-96 hmac-md5-96' -- "$cur" ) )
 }
 
 _ssh_options()
@@ -60,7 +59,7 @@ _ssh_suboption()
         PubkeyAuthentication|RhostsRSAAuthentication|RSAAuthentication|\
         StrictHostKeyChecking|TCPKeepAlive|UsePrivilegedPort|\
         VerifyHostKeyDNS|VisualHostKey)
-            COMPREPLY=( $( compgen -W 'yes no' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'yes no' -- "$cur" ) )
             ;;
         AddressFamily)
             COMPREPLY=( $( compgen -W 'any inet inet6' -- "$cur" ) )
@@ -86,8 +85,8 @@ _ssh_suboption()
                     -- "$cur" ) )
             ;;
         PreferredAuthentications)
-            COMPREPLY=( $( compgen -W 'gssapi-with-mic host-based \
-                    publickey keyboard-interactive password' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur" ) )
             ;;
         MACs)
             _ssh_macs
diff --git a/completions/strace b/completions/strace
index 9d28a54..0b8f0e9 100644
--- a/completions/strace
+++ b/completions/strace
@@ -58,7 +58,7 @@ _strace()
 
                             COMPREPLY=( $( compgen -W '${!syscalls[@]} file
                                 process network signal ipc desc all none' \
-                                    -- "$cur") )
+                                    -- "$cur" ) )
                             return 0
                             ;;
                     esac
@@ -89,9 +89,8 @@ _strace()
         esac
 
         if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '-c -d -f -ff -F --help -i -q \
-                -r -t -tt -ttt -T -v -V -x -xx -a -e -o -O -p \
-                -s -S -u -E' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '-c -d -f -ff -F --help -i -q -r -t -tt
+                -ttt -T -v -V -x -xx -a -e -o -O -p -s -S -u -E' -- "$cur" ) )
         else
             COMPREPLY=( $( compgen -c -- "$cur" ) )
         fi
diff --git a/completions/svk b/completions/svk
index 1146277..632eeb2 100644
--- a/completions/svk
+++ b/completions/svk
@@ -7,13 +7,12 @@ _svk()
 
     local commands options command
 
-    commands='add admin annotate ann blame praise cat checkout co cleanup \
-        cmerge cm commit ci copy cp delete del remove rm depotmap \
-        depot describe desc diff di help h ? import info list ls log \
-        merge mirror mi mkdir move mv ren rename patch propdel pd pdel \
-        propedit pe pedit propget pg pget proplist pl plist propset ps \
-        pset pull push resolved revert smerge sm status st stat switch \
-        sw sync sy update up verify'
+    commands='add admin annotate ann blame praise cat checkout co cleanup
+        cmerge cm commit ci copy cp delete del remove rm depotmap depot
+        describe desc diff di help h ? import info list ls log merge mirror mi
+        mkdir move mv ren rename patch propdel pd pdel propedit pe pedit
+        propget pg pget proplist pl plist propset ps pset pull push resolved
+        revert smerge sm status st stat switch sw sync sy update up verify'
 
     if [[ $cword -eq 1 ]] ; then
         if [[ "$cur" == -* ]]; then
@@ -49,99 +48,99 @@ _svk()
                     options='-r --revision'
                     ;;
                 checkout|co)
-                    options='-r --revision -q --quiet -N --non-recursive -l \
+                    options='-r --revision -q --quiet -N --non-recursive -l
                         --list -d --detach --export --relocate --purge'
                     ;;
                 cleanup)
                     options='-a --all'
                     ;;
                 cmerge|cm)
-                    options='-c --change -l --log -r --revision -a --auto \
-                        --verbatim --no-ticket -m --message -F --file \
-                        --template --encoding -P --patch -S --sign -C \
+                    options='-c --change -l --log -r --revision -a --auto
+                        --verbatim --no-ticket -m --message -F --file
+                        --template --encoding -P --patch -S --sign -C
                         --check-only --direct'
                     ;;
                 commit|ci)
-                    options='--import -m --message -F --file --encoding \
-                        --template -P --patch -S --sign -C --check-only -N \
+                    options='--import -m --message -F --file --encoding
+                        --template -P --patch -S --sign -C --check-only -N
                         --non-recursive --direct'
                     ;;
                 copy|cp)
-                    options='-r --revision -p --parent -q --quiet -m --message \
-                        -F --file --template --encoding -P --patch -S --sign \
-                        -C --check-only --direct'
+                    options='-r --revision -p --parent -q --quiet -m --message
+                        -F --file --template --encoding -P --patch -S --sign -C
+                        --check-only --direct'
                     ;;
                 delete|del|remove|rm)
-                    options='-k --keep-local -m --message -F --file --encoding \
-                        --template -P --patch -S --sign -C --check-only \
+                    options='-k --keep-local -m --message -F --file --encoding
+                        --template -P --patch -S --sign -C --check-only
                         --direct'
                     ;;
                 depotmap|depot)
                     options='-i --init -l --list -d --detach --relocate'
                     ;;
                 diff|di)
-                    options='-r --revision -s --summarize -b --verbose -N \
+                    options='-r --revision -s --summarize -b --verbose -N
                         --non-recursive'
                     ;;
                 import)
-                    options='-f --from-checkout -t --to-checkout -m --message \
-                        -F --file --template --encoding -P --patch -S --sign \
-                        -C --check-only -N --non-recursive --direct'
+                    options='-f --from-checkout -t --to-checkout -m --message
+                        -F --file --template --encoding -P --patch -S --sign -C
+                        --check-only -N --non-recursive --direct'
                     ;;
                 list|ls)
-                    options='-r --revision -v --verbose -R --recursive -d \
+                    options='-r --revision -v --verbose -R --recursive -d
                         --depth -f --full-path'
                     ;;
                 log)
-                    options='-r --revision -l --limit -q --quiet -x --cross \
-                        -v --verbose'
+                    options='-r --revision -l --limit -q --quiet -x --cross -v
+                        --verbose'
                     ;;
                 merge)
-                    options='-r --revision -c --change -I --incremental -a \
-                        --auto -l --log -s --sync -t --to -f --from \
-                        --verbatim --no-ticket --track-rename -m --message \
-                        -F --file --template --encoding -P --patch -S --sign \
-                        -C --check-only --direct'
+                    options='-r --revision -c --change -I --incremental -a
+                        --auto -l --log -s --sync -t --to -f --from --verbatim
+                        --no-ticket --track-rename -m --message -F --file
+                        --template --encoding -P --patch -S --sign -C
+                        --check-only --direct'
                     ;;
                 mirror|mi)
-                    options='-l --list -d --detach --relocate --recover \
+                    options='-l --list -d --detach --relocate --recover
                         --unlock --upgrade'
                     ;;
                 mkdir)
-                    options='-p --parent -m --message -F --file --template \
-                        --encoding -P --patch -S --sign -C --check-only \
+                    options='-p --parent -m --message -F --file --template
+                        --encoding -P --patch -S --sign -C --check-only
                         --direct'
                     ;;
                 move|mv|rename|ren)
-                    options='-r --revision -p --parent -q --quiet -m \
-                        --message -F --file --encoding --template -P --patch \
-                        -S --sign -C --check-only --direct'
+                    options='-r --revision -p --parent -q --quiet -m --message
+                        -F --file --encoding --template -P --patch -S --sign -C
+                        --check-only --direct'
                     ;;
                 patch)
                     options='--depot'
                     ;;
                 propdel|propset|pdel|pset|pd|ps)
-                    options='-R --recursive -r --revision --revprop -m \
-                        --message -F --file --template --encoding -P --patch \
-                        -S --sign -C --check-only -q --quiet --direct'
+                    options='-R --recursive -r --revision --revprop -m
+                        --message -F --file --template --encoding -P --patch -S
+                        --sign -C --check-only -q --quiet --direct'
                     ;;
                 propedit|pedit|pe)
-                    options='-R --recursive -r --revision --revprop -m \
-                        --message -F --file --template --encoding -P --patch \
+                    options='-R --recursive -r --revision --revprop -m
+                        --message -F --file --template --encoding -P --patch
                         -S --sign -C --check-only --direct'
                     ;;
                 propget|pget|pg)
                     options='-R --recursive -r --revision --revprop --strict'
                     ;;
                 proplist|plist|pl)
-                    options='-R --recursive -v --verbose \
-                        -r --revision --revprop'
+                    options='-R --recursive -v --verbose -r --revision
+                        --revprop'
                     ;;
                 pull)
                     options='-a --all -l --lump'
                     ;;
                 push)
-                    options='-f --from -l --lump -C --check -P --patch -S \
+                    options='-f --from -l --lump -C --check -P --patch -S
                         --sign --verbatim'
                     ;;
                 resolved)
@@ -151,14 +150,14 @@ _svk()
                     options='-R --recursive -q --quiet'
                     ;;
                 smerge|sm)
-                    options='-I --incremental -l --log -B --baseless -b \
-                        --base -s --sync -t --to -f --from --verbatim \
-                        --no-ticket --track-rename --host --remoterev -m \
-                        --message -F --file --template --encoding -P --patch \
-                        -S --sign -C --check-only --direct'
+                    options='-I --incremental -l --log -B --baseless -b --base
+                        -s --sync -t --to -f --from --verbatim --no-ticket
+                        --track-rename --host --remoterev -m --message -F
+                        --file --template --encoding -P --patch -S --sign -C
+                        --check-only --direct'
                     ;;
                 status|stat|st)
-                    options='-q --quiet --no-ignore -N --non-recursive -v \
+                    options='-q --quiet --no-ignore -N --non-recursive -v
                         --verbose'
                     ;;
                 switch|sw)
@@ -168,7 +167,7 @@ _svk()
                     options='-a --all -s --skipto -t --torev'
                     ;;
                 update|up)
-                    options='-r --revision -N --non-recursive -C --check-only \
+                    options='-r --revision -N --non-recursive -C --check-only
                         -s --sync -m --merge -q --quiet'
                     ;;
             esac
@@ -178,17 +177,17 @@ _svk()
         else
             case $command in
                 help|h|\?)
-                    COMPREPLY=( $( compgen -W "$commands \
-                        environment commands intro" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$commands environment commands
+                        intro" -- "$cur" ) )
                     ;;
                 admin)
-                    COMPREPLY=( $( compgen -W 'help deltify dump hotcopy \
-                        list-dblogs list-unused-dblogs load lstxns recover \
+                    COMPREPLY=( $( compgen -W 'help deltify dump hotcopy
+                        list-dblogs list-unused-dblogs load lstxns recover
                         rmtxns setlog verify rmcache' -- "$cur" ) )
                     ;;
                 patch)
-                    COMPREPLY=( $( compgen -W '--ls --list --cat --view \
-                        --regen --regenerate --up --update --apply --rm \
+                    COMPREPLY=( $( compgen -W '--ls --list --cat --view
+                        --regen --regenerate --up --update --apply --rm
                         --delete' -- "$cur" ) )
                     ;;
                 sync)
diff --git a/completions/sync_members b/completions/sync_members
index 77420f1..715d53f 100644
--- a/completions/sync_members
+++ b/completions/sync_members
@@ -7,7 +7,7 @@ _sync_members()
 
     case $prev in
         -w|-g|-d|--welcome-msg|--goodbye-msg|--digest)
-            COMPREPLY=( $( compgen -W 'y n' -- "$cur") )
+            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
             return 0
             ;;
         -d|--file)
@@ -19,8 +19,8 @@ _sync_members()
     $split && return 0
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--no-change --welcome-msg \
-            --goodbye-msg --digest --notifyadmin --file --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--no-change --welcome-msg --goodbye-msg
+            --digest --notifyadmin --file --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/umount.linux b/completions/umount.linux
index 9723180..9bc9fcc 100644
--- a/completions/umount.linux
+++ b/completions/umount.linux
@@ -105,11 +105,11 @@ _umount()
                 cur="${cur##*,}"
                 split=true
             fi
-            COMPREPLY=( $(compgen -W 'adfs affs autofs btrfs cifs coda
+            COMPREPLY=( $( compgen -W 'adfs affs autofs btrfs cifs coda
                 cramfs debugfs devpts efs ext2 ext3 ext4 fuse hfs hfsplus hpfs
                 iso9660 jfs minix msdos ncpfs nfs nfs4 ntfs ntfs-3g proc qnx4
                 ramfs reiserfs romfs squashfs smbfs sysv tmpfs ubifs udf ufs
-                umsdos usbfs vfat xfs' -- "$cur") )
+                umsdos usbfs vfat xfs' -- "$cur" ) )
             _fstypes
             $split && COMPREPLY=( ${COMPREPLY[@]/#/$prev,} )
             return
diff --git a/completions/unpack200 b/completions/unpack200
index de708fe..fe058c6 100644
--- a/completions/unpack200
+++ b/completions/unpack200
@@ -33,7 +33,7 @@ _unpack200()
 
     if ! $pack ; then
         if [[ "$cur" == -* ]] ; then
-            COMPREPLY=( $( compgen -W '--deflate-hint= --remove-pack-file \
+            COMPREPLY=( $( compgen -W '--deflate-hint= --remove-pack-file
                 --verbose --quiet --log-file= --help --version' -- "$cur" ) )
             [[ $COMPREPLY == *= ]] && compopt -o nospace
         else
diff --git a/completions/unrar b/completions/unrar
index 67a316f..f2a8a18 100644
--- a/completions/unrar
+++ b/completions/unrar
@@ -6,9 +6,9 @@ _unrar()
     _init_completion || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '-ad -ap -av- -c- -cfg- -cl -cu \
-            -dh -ep -f -idp -ierr -inul -kb -o+ -o- -ow -p -p- -r -ta \
-            -tb -tn -to -u -v -ver -vp -x -x@ -y' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-ad -ap -av- -c- -cfg- -cl -cu -dh -ep -f
+            -idp -ierr -inul -kb -o+ -o- -ow -p -p- -r -ta -tb -tn -to -u -v
+            -ver -vp -x -x@ -y' -- "$cur" ) )
     else
         if [[ $cword -eq 1 ]]; then
             COMPREPLY=( $( compgen -W 'e l lb lt p t v vb vt x' -- "$cur" ) )
diff --git a/completions/update-alternatives b/completions/update-alternatives
index 051b114..e421db8 100644
--- a/completions/update-alternatives
+++ b/completions/update-alternatives
@@ -82,8 +82,8 @@ _update_alternatives()
             _installed_alternatives
             ;;
         *)
-            COMPREPLY=( $( compgen -W '--verbose --quiet --help --version \
-                --altdir --admindir --install --remove --auto --display \
+            COMPREPLY=( $( compgen -W '--verbose --quiet --help --version
+                --altdir --admindir --install --remove --auto --display
                 --config --set' -- "$cur" ) )
     esac
 } &&
diff --git a/completions/update-rc.d b/completions/update-rc.d
index 3dbad2e..9a16385 100644
--- a/completions/update-rc.d
+++ b/completions/update-rc.d
@@ -53,7 +53,7 @@ _update_rc_d()
             COMPREPLY=()
         fi
     elif [[ "$prev" == "." ]]; then
-        COMPREPLY=( $(compgen -W "start stop" -- "$cur") )
+        COMPREPLY=( $( compgen -W "start stop" -- "$cur" ) )
     else
         COMPREPLY=()
     fi
diff --git a/completions/vncviewer b/completions/vncviewer
index 46d6c61..a1c16d6 100644
--- a/completions/vncviewer
+++ b/completions/vncviewer
@@ -27,8 +27,8 @@ _tightvncviewer()
             return 0
             ;;
         -encodings)
-            COMPREPLY=( $( compgen -W 'copyrect tight hextile zlib \
-                corre rre raw' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'copyrect tight hextile zlib corre rre
+                raw' -- "$cur" ) )
             return 0
             ;;
         -via)
@@ -39,11 +39,10 @@ _tightvncviewer()
 
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-help -listen -via -shared -noshared\
-            -viewonly -fullscreen -noraiseonbeep -passwd -encodings\
-            -bgr233 -owncmap -truecolour -truecolor -depth \
-            -compresslevel -quality -nojpeg -nocursorshape \
-            -x11cursor' -- $cur ) )
+        COMPREPLY=( $( compgen -W '-help -listen -via -shared -noshared
+            -viewonly -fullscreen -noraiseonbeep -passwd -encodings -bgr233
+            -owncmap -truecolour -truecolor -depth -compresslevel -quality
+            -nojpeg -nocursorshape -x11cursor' -- "$cur" ) )
     else
         _known_hosts_real "$cur"
     fi
@@ -68,7 +67,7 @@ _xvnc4viewer()
             ;;
         # -PreferredEncoding
         -[pP][rR][eE][fF][eE][rR][rR][eE][dD][eE][nN][cC][oO][dD][iI][nN][gG])
-            COMPREPLY=( $( compgen -W 'zrle hextile raw' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'zrle hextile raw' -- "$cur" ) )
             return 0
             ;;
         # -via
@@ -80,16 +79,12 @@ _xvnc4viewer()
 
     if [[ "$cur" == -* || "$cur" == --* ]]; then
         # Default to vncviewer camelcase options, see `vncviewer -help'
-        local dash options=( \
-            AcceptClipboard AutoSelect DebugDelay display \
-            DotWhenNoCursor FullColor FullColour FullScreen \
-            geometry help listen Log \
-            LowColourLevel MenuKey name Parent \
-            passwd PasswordFile PointerEventInterval PreferredEncoding \
-            SendClipboard SendPrimary Shared UseLocalCursor \
-            via ViewOnly WMDecorationHeight WMDecorationWidth \
-            ZlibLevel \
-        )
+        local dash options=( AcceptClipboard AutoSelect DebugDelay display
+            DotWhenNoCursor FullColor FullColour FullScreen geometry help
+            listen Log LowColourLevel MenuKey name Parent passwd PasswordFile
+            PointerEventInterval PreferredEncoding SendClipboard SendPrimary
+            Shared UseLocalCursor via ViewOnly WMDecorationHeight
+            WMDecorationWidth ZlibLevel )
         [[ "$cur" == --* ]] && dash=-- || dash=-
 
         local option oldNoCaseMatch=$(shopt -p nocasematch)
diff --git a/completions/withlist b/completions/withlist
index a48d7ea..4aaad60 100644
--- a/completions/withlist
+++ b/completions/withlist
@@ -6,8 +6,8 @@ _withlist()
     _init_completion || return
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--lock --interactive \
-            --run --all --quiet --help' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--lock --interactive --run --all --quiet
+            --help' -- "$cur" ) )
     else
         _xfunc list_lists _mailman_lists
     fi
diff --git a/completions/xfreerdp b/completions/xfreerdp
index 0dfb853..f018844 100644
--- a/completions/xfreerdp
+++ b/completions/xfreerdp
@@ -16,7 +16,7 @@ _xfreerdp()
             return 0
             ;;
         -x)
-            COMPREPLY=( $( compgen -W 'b broadband m modem l lan' -- $cur ) )
+            COMPREPLY=( $( compgen -W 'b broadband m modem l lan' -- "$cur" ) )
             return 0
             ;;
         --plugin)
@@ -26,8 +26,8 @@ _xfreerdp()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-u -d -s -c -p -n -t -g -a -z -f -x -O -o \
-            -k --kbd-list -h --plugin --data' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '-u -d -s -c -p -n -t -g -a -z -f -x -O -o -k
+            --kbd-list -h --plugin --data' -- "$cur" ) )
     else
         _known_hosts_real "$cur"
     fi
diff --git a/completions/xm b/completions/xm
index 37bd3d0..e3ae979 100644
--- a/completions/xm
+++ b/completions/xm
@@ -2,14 +2,14 @@
 
 _xen_domain_names()
 {
-    COMPREPLY=( $(compgen -W "$( xm list 2>/dev/null | \
-        awk '!/Name|Domain-0/ { print $1 }'  )" -- "$cur") )
+    COMPREPLY=( $( compgen -W "$( xm list 2>/dev/null | \
+        awk '!/Name|Domain-0/ { print $1 }'  )" -- "$cur" ) )
 }
 
 _xen_domain_ids()
 {
-    COMPREPLY=( $(compgen -W "$( xm list 2>/dev/null | \
-        awk '!/Name|Domain-0/ { print $2 }' )" -- "$cur") )
+    COMPREPLY=( $( compgen -W "$( xm list 2>/dev/null | \
+        awk '!/Name|Domain-0/ { print $2 }' )" -- "$cur" ) )
 }
 
 _xm()
@@ -21,16 +21,16 @@ _xm()
 
     local command options
 
-    commands='console vncviewer create new delete destroy domid domname \
-        dump-core list mem-max mem-set migrate pause reboot rename reset \
-        restore resume save shutdown start suspend sysrq trigger top unpause \
-        uptime usb-add usb-del vcpu-list vcpu-pin vcpu-set debug-keys dmesg \
-        info log serve sched-credit sched-sedf block-attach block-detach \
-        block-list block-configure network-attach network-detach network-list \
-        vtpm-list pci-attach pci-detach pci-list pci-list-assignable-devices \
-        scsi-attach scsi-detach scsi-list vnet-list vnet-create vnet-delete \
-        labels addlabel rmlabel getlabel dry-run resources dumppolicy \
-        setpolicy resetpolicy getpolicy shell help'
+    commands='console vncviewer create new delete destroy domid domname
+        dump-core list mem-max mem-set migrate pause reboot rename reset
+        restore resume save shutdown start suspend sysrq trigger top unpause
+        uptime usb-add usb-del vcpu-list vcpu-pin vcpu-set debug-keys dmesg
+        info log serve sched-credit sched-sedf block-attach block-detach
+        block-list block-configure network-attach network-detach network-list
+        vtpm-list pci-attach pci-detach pci-list pci-list-assignable-devices
+        scsi-attach scsi-detach scsi-list vnet-list vnet-create vnet-delete
+        labels addlabel rmlabel getlabel dry-run resources dumppolicy setpolicy
+        resetpolicy getpolicy shell help'
 
     if [[ $cword -eq 1 ]] ; then
         COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
@@ -69,12 +69,9 @@ _xm()
                     options='--dumpxml'
                     ;;
                 new)
-                    options='-h --help --help_config -q \
-                        --quiet --path= -f= \
-                        --defconfig= -F= --config= \
-                        -b --dryrun -x --xmldryrun \
-                        -s --skipdtd -p --paused -c \
-                        --console_autoconnect'
+                    options='-h --help --help_config -q --quiet --path= -f=
+                        --defconfig= -F= --config= -b --dryrun -x --xmldryrun
+                        -s --skipdtd -p --paused -c --console_autoconnect'
                     ;;
             esac
             COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
@@ -122,7 +119,8 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "r s e i u b" -- "$cur") )
+                            COMPREPLY=( $( compgen -W "r s e i u b" \
+                                -- "$cur" ) )
                             ;;
                     esac
                     ;;
@@ -133,10 +131,11 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "phy: file:" -- "$cur") )
+                            COMPREPLY=( $( compgen -W "phy: file:" \
+                                -- "$cur" ) )
                             ;;
                         5)
-                            COMPREPLY=( $(compgen -W "w r" -- "$cur") )
+                            COMPREPLY=( $( compgen -W "w r" -- "$cur" ) )
                             ;;
                         6)
                             _xen_domain_names
@@ -150,9 +149,9 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "$( xm block-list $prev \
+                            COMPREPLY=( $( compgen -W "$( xm block-list $prev \
                                 2>/dev/null | awk '!/Vdev/ { print $1 }' )" \
-                                -- "$cur") )
+                                -- "$cur" ) )
                             ;;
                     esac
                     ;;
@@ -163,8 +162,8 @@ _xm()
                             _xen_domain_names
                             ;;
                         *)
-                            COMPREPLY=( $(compgen -W "script= ip= mac= \
-                                bridge= backend=" -- "$cur") )
+                            COMPREPLY=( $( compgen -W "script= ip= mac= bridge=
+                                backend=" -- "$cur" ) )
                             ;;
                     esac
                     ;;
@@ -177,7 +176,7 @@ _xm()
                         3)
                             COMPREPLY=( $(compgen -W "$( xm network-list $prev \
                                 2>/dev/null | awk '!/Idx/ { print $1 }' )" \
-                                -- "$cur") )
+                                -- "$cur" ) )
                             ;;
                     esac
                     ;;
diff --git a/completions/xmlwf b/completions/xmlwf
index 6b7ad1b..1520613 100644
--- a/completions/xmlwf
+++ b/completions/xmlwf
@@ -11,8 +11,8 @@ _xmlwf()
             return 0
             ;;
         -e)
-            COMPREPLY=( $( compgen -W 'US-ASCII UTF-8 UTF-16 \
-                ISO-8859-1' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'US-ASCII UTF-8 UTF-16 ISO-8859-1' \
+                -- "$cur" ) )
             return 0
             ;;
         -v)
diff --git a/completions/ypmatch b/completions/ypmatch
index 584b0d0..99d80c4 100644
--- a/completions/ypmatch
+++ b/completions/ypmatch
@@ -13,12 +13,12 @@ _ypmatch()
     if [[ $cmd == ypmatch && $cword -eq 1 && ${#words[@]} -eq 3 ]]; then
         map=${words[2]}
         COMPREPLY=( $( compgen -W '$( ypcat $map 2>/dev/null | \
-            cut -d':' -f 1 )' -- "$cur") )
+            cut -d':' -f 1 )' -- "$cur" ) )
     else
         [[ $cmd == ypmatch && $cword -ne 2 ]] && return 0
         COMPREPLY=( $( compgen -W \
             '$( printf "%s\n" $(ypcat -x 2>/dev/null | \
-                cut -d"\"" -f 2) )' -- "$cur") )
+                cut -d"\"" -f 2) )' -- "$cur" ) )
     fi
 
     return 0

-- 
bash-completion



More information about the Bash-completion-commits mailing list