From 302559aa951c0b1192c66a6cfc6f00d75bcc8312 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Wed, 16 Jun 2010 17:45:04 +0200
Subject: [PATCH 001/214] Fix CHANGES file

---
 CHANGES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index cb3523bf..e13527c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-bash-completion (2.x)
+bash-completion (1.2)
 
   [ David Paleino ]
   * Don't use pidof in _known_hosts_real() to detect whether Avahi is
@@ -132,7 +132,7 @@ bash-completion (2.x)
   [ Mark van Rossum ]
   * Add basic lyx completion.
 
- -- David Paleino <d.paleino@gmail.com>  Mon, 14 Jun 2010 08:52:01 +0200
+ -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:44:59 +0200
 
 bash-completion (1.1)
 

From f5319985763f1fe7340fa918b98c111d3718c628 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Wed, 16 Jun 2010 17:53:29 +0200
Subject: [PATCH 002/214] New stanza for next release

---
 CHANGES | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index e13527c0..803cc263 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+bash-completion (2.x)
+
+  [ David Paleino ]
+  * Start work on 2.0
+
+ -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
+
 bash-completion (1.2)
 
   [ David Paleino ]

From f374d135169324ded35cbc2babedfdd7683c1b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 16 Jun 2010 20:33:43 +0300
Subject: [PATCH 003/214] Activate hping2 completion also for hping and hping3.

---
 CHANGES        | 3 +++
 contrib/hping2 | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 803cc263..46885ea5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ bash-completion (2.x)
   [ David Paleino ]
   * Start work on 2.0
 
+  [ Ville Skyttä ]
+  * Activate hping2 completion also for hping and hping3.
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/contrib/hping2 b/contrib/hping2
index b1607f83..e2e6bf1a 100644
--- a/contrib/hping2
+++ b/contrib/hping2
@@ -1,6 +1,6 @@
 # bash completion for hping2
 
-have hping2 &&
+have hping || have hping2 || have hping3 &&
 _hping2()
 {
     local cur prev
@@ -44,7 +44,7 @@ _hping2()
         _known_hosts_real "$cur"
     fi
 } &&
-complete -F _hping2 hping2 hping
+complete -F _hping2 hping hping2 hping3
 
 # Local variables:
 # mode: shell-script

From c858043cbc58333d15be1c1750ef190762c4fe4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 16 Jun 2010 20:34:08 +0300
Subject: [PATCH 004/214] Add basic tests for hping2.

---
 test/completion/hping2.exp      |  1 +
 test/lib/completions/hping2.exp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 test/completion/hping2.exp
 create mode 100644 test/lib/completions/hping2.exp

diff --git a/test/completion/hping2.exp b/test/completion/hping2.exp
new file mode 100644
index 00000000..e9df7c2b
--- /dev/null
+++ b/test/completion/hping2.exp
@@ -0,0 +1 @@
+assert_source_completions hping2
diff --git a/test/lib/completions/hping2.exp b/test/lib/completions/hping2.exp
new file mode 100644
index 00000000..03af8c96
--- /dev/null
+++ b/test/lib/completions/hping2.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "hping2 "
+
+
+sync_after_int
+
+
+teardown

From 1f8b55a92aba6d03bb4c43dade1f8b2e2b847b61 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Thu, 17 Jun 2010 17:43:18 +0200
Subject: [PATCH 005/214] Fixed "service" completion, thanks to John Hedges
 (Debian: #586210)

  The patch makes it safe even when every file in /etc/init.d/*
  has a proper completion (unlikely, but seems like it happened).

  Thanks to John Hedges <john@drystone.co.uk> for the patch, slightly
  modified to make it more compact.
---
 CHANGES         | 2 +-
 contrib/service | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 46885ea5..bb09a83c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 bash-completion (2.x)
 
   [ David Paleino ]
-  * Start work on 2.0
+  * Fixed "service" completion, thanks to John Hedges (Debian: #586210)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
diff --git a/contrib/service b/contrib/service
index 9ebd117d..f27222a1 100644
--- a/contrib/service
+++ b/contrib/service
@@ -32,9 +32,10 @@ _service()
     return 0
 } &&
 complete -F _service service
-[ -d /etc/init.d/ ] && complete -F _service -o default \
-    $(for i in /etc/init.d/*; do
-    complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
+[ -d /etc/init.d/ ] && (
+    services=$(for i in /etc/init.d/*; do
+        complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
+    [ -n "$services" ] && complete -F _service -o default $services;)
 
 # Local variables:
 # mode: shell-script

From 6ac176ec7232ef9b2e3c80deacceac53dae6ae00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 18 Jun 2010 00:24:04 +0300
Subject: [PATCH 006/214] Add crontab completion.

---
 CHANGES                          |  1 +
 Makefile.am                      |  1 +
 contrib/crontab                  | 60 ++++++++++++++++++++++++++++++++
 test/completion/crontab.exp      |  1 +
 test/lib/completions/crontab.exp | 20 +++++++++++
 5 files changed, 83 insertions(+)
 create mode 100644 contrib/crontab
 create mode 100644 test/completion/crontab.exp
 create mode 100644 test/lib/completions/crontab.exp

diff --git a/CHANGES b/CHANGES
index bb09a83c..8601d5c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
+  * Add crontab completion.
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/Makefile.am b/Makefile.am
index 93574a71..d34b0283 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,7 @@ bashcomp_DATA = contrib/abook \
 		contrib/cowsay \
 		contrib/cpan2dist \
 		contrib/cpio \
+		contrib/crontab \
 		contrib/cups \
 		contrib/cryptsetup \
 		contrib/cvs \
diff --git a/contrib/crontab b/contrib/crontab
new file mode 100644
index 00000000..cb440a6f
--- /dev/null
+++ b/contrib/crontab
@@ -0,0 +1,60 @@
+# crontab(1) completion
+
+have crontab &&
+_crontab()
+{
+    local cur prev
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -u)
+            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    local i opts=" -u -l -r -e" # leading space at start is significant...
+    [ "$(uname -s)" = Linux ] && opts="$opts -i"
+    [ -e /etc/selinux ] && opts="$opts -s"
+    for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+        case "${COMP_WORDS[i]}" in
+            -l)
+                opts=${opts// -l -r -e/}
+                opts=${opts// -i/}
+                opts=${opts// -s/}
+                ;;
+            -e)
+                opts=${opts// -l -r -e/}
+                opts=${opts// -i/}
+                ;;
+            -r)
+                opts=${opts// -l -r -e/}
+                ;;
+            -u)
+                opts=${opts// -u/}
+                opts=${opts// -i/}
+                ;;
+            -i|-s)
+                opts=${opts// ${COMP_WORDS[i]}/}
+                ;;
+        esac
+    done
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$opts' -- "$cur" ) )
+        return 0
+    fi
+
+    # do filenames only if we did not have -l, -r, or -e
+    [[ "${COMP_LINE}" == *\ -@(l|r|e)* ]] || _filedir
+} &&
+complete -F _crontab -o filenames crontab
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/crontab.exp b/test/completion/crontab.exp
new file mode 100644
index 00000000..2a649491
--- /dev/null
+++ b/test/completion/crontab.exp
@@ -0,0 +1 @@
+assert_source_completions crontab
diff --git a/test/lib/completions/crontab.exp b/test/lib/completions/crontab.exp
new file mode 100644
index 00000000..b7398e62
--- /dev/null
+++ b/test/lib/completions/crontab.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "crontab "
+
+
+sync_after_int
+
+
+teardown

From 7ed79a9245596d8efc39c761092aa6ed58414bf2 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 18 Jun 2010 16:59:38 +0200
Subject: [PATCH 007/214] (testsuite) Remove need specify `./' with run args
 This allows running tests as:

    ./run unit/_filedir.exp

instead of

    ./run ./unit/_filedir.exp
---
 test/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run b/test/run
index b798676f..498d98b7 100755
--- a/test/run
+++ b/test/run
@@ -44,7 +44,7 @@ while [[ $# > 0 ]]; do
         --timeout=*) timeout=${1/--timeout=};;
         --tool=*) set_tool "${1#/--tool=}";;
         --tool) shift; set_tool "$1";;
-        */completion/*.exp|*/unit/*.exp)
+        completion/*.exp|*/completion/*.exp|unit/*.exp|*/unit/*.exp)
             arg=${1%/*}
             set_tool "${arg##*/}"
             args+=("${1##*/}")

From 51b3e20ebcf5f5b598ea33a6d1d393ffa5990430 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 18 Jun 2010 17:21:38 +0200
Subject: [PATCH 008/214] (testsuite) Drop ending block comments Instead of
 writing `}; # if', write just `}' as was discussed here:

    http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01815.html
---
 test/config/default.exp                       |  16 +-
 test/lib/completions/a2ps.exp                 |   4 +-
 test/lib/completions/abook.exp                |   4 +-
 test/lib/completions/acroread.exp             |   4 +-
 test/lib/completions/add_members.exp          |   4 +-
 test/lib/completions/alias.exp                |   6 +-
 test/lib/completions/animate.exp              |   4 +-
 test/lib/completions/ant.exp                  |   4 +-
 test/lib/completions/apache2ctl.exp           |   4 +-
 test/lib/completions/apt-build.exp            |   4 +-
 test/lib/completions/apt-cache.exp            |   4 +-
 test/lib/completions/apt-get.exp              |   4 +-
 test/lib/completions/aptitude.exp             |   4 +-
 test/lib/completions/arch.exp                 |   4 +-
 test/lib/completions/arpspoof.exp             |   4 +-
 test/lib/completions/aspell.exp               |   4 +-
 test/lib/completions/autoconf.exp             |   4 +-
 test/lib/completions/automake.exp             |   4 +-
 test/lib/completions/autorpm.exp              |   4 +-
 test/lib/completions/awk.exp                  |   4 +-
 test/lib/completions/bash.exp                 |   4 +-
 test/lib/completions/bc.exp                   |   4 +-
 test/lib/completions/bison.exp                |   4 +-
 test/lib/completions/bk.exp                   |   4 +-
 test/lib/completions/brctl.exp                |   4 +-
 test/lib/completions/btdownloadcurses.py.exp  |   4 +-
 test/lib/completions/btdownloadgui.py.exp     |   4 +-
 .../lib/completions/btdownloadheadless.py.exp |   4 +-
 test/lib/completions/bzip2.exp                |   4 +-
 test/lib/completions/c++.exp                  |   4 +-
 test/lib/completions/cancel.exp               |   6 +-
 test/lib/completions/cardctl.exp              |   4 +-
 test/lib/completions/cat.exp                  |   4 +-
 test/lib/completions/cc.exp                   |   4 +-
 test/lib/completions/cd.exp                   |   6 +-
 test/lib/completions/cdrecord.exp             |   4 +-
 test/lib/completions/change_pw.exp            |   4 +-
 test/lib/completions/check_db.exp             |   4 +-
 test/lib/completions/check_perms.exp          |   4 +-
 test/lib/completions/chgrp.exp                |   4 +-
 test/lib/completions/chkconfig.exp            |   4 +-
 test/lib/completions/chown.exp                |   4 +-
 test/lib/completions/chsh.exp                 |   4 +-
 test/lib/completions/ci.exp                   |   4 +-
 test/lib/completions/civclient.exp            |   4 +-
 test/lib/completions/civserver.exp            |   4 +-
 test/lib/completions/cksfv.exp                |   4 +-
 test/lib/completions/cleanarch.exp            |   4 +-
 test/lib/completions/clisp.exp                |   4 +-
 test/lib/completions/clone_member.exp         |   4 +-
 test/lib/completions/co.exp                   |   4 +-
 test/lib/completions/composite.exp            |   4 +-
 test/lib/completions/config_list.exp          |   4 +-
 test/lib/completions/configure.exp            |   4 +-
 test/lib/completions/convert.exp              |   4 +-
 test/lib/completions/cowsay.exp               |   4 +-
 test/lib/completions/cp.exp                   |   4 +-
 test/lib/completions/cpio.exp                 |   4 +-
 test/lib/completions/createdb.exp             |   4 +-
 test/lib/completions/crontab.exp              |   4 +-
 test/lib/completions/cryptsetup.exp           |   4 +-
 test/lib/completions/csplit.exp               |   4 +-
 test/lib/completions/cut.exp                  |   4 +-
 test/lib/completions/cvs.exp                  |   6 +-
 test/lib/completions/cvsps.exp                |   6 +-
 test/lib/completions/date.exp                 |   4 +-
 test/lib/completions/dcop.exp                 |   6 +-
 test/lib/completions/dd.exp                   |   6 +-
 test/lib/completions/df.exp                   |   4 +-
 test/lib/completions/dhclient.exp             |   4 +-
 test/lib/completions/dict.exp                 |   4 +-
 test/lib/completions/diff.exp                 |   4 +-
 test/lib/completions/dir.exp                  |   4 +-
 test/lib/completions/display.exp              |   4 +-
 test/lib/completions/dnsspoof.exp             |   4 +-
 test/lib/completions/dpkg-deb.exp             |   4 +-
 test/lib/completions/dpkg-reconfigure.exp     |   4 +-
 test/lib/completions/dpkg-source.exp          |   4 +-
 test/lib/completions/dpkg.exp                 |   6 +-
 test/lib/completions/dropdb.exp               |   4 +-
 test/lib/completions/dselect.exp              |   4 +-
 test/lib/completions/dsniff.exp               |   4 +-
 test/lib/completions/du.exp                   |   4 +-
 test/lib/completions/dumpdb.exp               |   4 +-
 test/lib/completions/enscript.exp             |   4 +-
 test/lib/completions/env.exp                  |   6 +-
 test/lib/completions/evince.exp               |   4 +-
 test/lib/completions/expand.exp               |   6 +-
 test/lib/completions/filesnarf.exp            |   4 +-
 test/lib/completions/find.exp                 |  10 +-
 test/lib/completions/find_member.exp          |   4 +-
 test/lib/completions/finger.exp               |  12 +-
 test/lib/completions/fmt.exp                  |   6 +-
 test/lib/completions/fold.exp                 |   6 +-
 test/lib/completions/g++.exp                  |   4 +-
 test/lib/completions/g4.exp                   |   4 +-
 test/lib/completions/g77.exp                  |   4 +-
 test/lib/completions/gcc.exp                  |   4 +-
 test/lib/completions/gcj.exp                  |   4 +-
 test/lib/completions/gcl.exp                  |   4 +-
 test/lib/completions/gdb.exp                  |   4 +-
 test/lib/completions/genaliases.exp           |   4 +-
 test/lib/completions/getent.exp               |   4 +-
 test/lib/completions/gkrellm.exp              |   4 +-
 test/lib/completions/gmplayer.exp             |   4 +-
 test/lib/completions/gnatmake.exp             |   4 +-
 test/lib/completions/gpc.exp                  |   4 +-
 test/lib/completions/gperf.exp                |   4 +-
 test/lib/completions/gpg.exp                  |   4 +-
 test/lib/completions/gprof.exp                |   6 +-
 test/lib/completions/grep.exp                 |   4 +-
 test/lib/completions/grub.exp                 |   4 +-
 test/lib/completions/gzip.exp                 |   6 +-
 test/lib/completions/hcitool.exp              |   4 +-
 test/lib/completions/head.exp                 |   6 +-
 test/lib/completions/hping2.exp               |   4 +-
 test/lib/completions/iconv.exp                |   4 +-
 test/lib/completions/id.exp                   |   4 +-
 test/lib/completions/identify.exp             |   4 +-
 test/lib/completions/ifdown.exp               |   4 +-
 test/lib/completions/ifup.exp                 |   4 +-
 test/lib/completions/indent.exp               |   4 +-
 test/lib/completions/info.exp                 |   4 +-
 test/lib/completions/inject.exp               |   4 +-
 test/lib/completions/insmod.exp               |   4 +-
 test/lib/completions/invoke-rc.d.exp          |   4 +-
 test/lib/completions/ipsec.exp                |   4 +-
 test/lib/completions/ipv6calc.exp             |   4 +-
 test/lib/completions/irb.exp                  |   4 +-
 test/lib/completions/isql.exp                 |   4 +-
 test/lib/completions/iwconfig.exp             |   4 +-
 test/lib/completions/iwlist.exp               |   4 +-
 test/lib/completions/iwpriv.exp               |   4 +-
 test/lib/completions/iwspy.exp                |   4 +-
 test/lib/completions/jar.exp                  |   4 +-
 test/lib/completions/jarsigner.exp            |   4 +-
 test/lib/completions/java.exp                 |   4 +-
 test/lib/completions/javac.exp                |   4 +-
 test/lib/completions/javadoc.exp              |   4 +-
 test/lib/completions/k3b.exp                  |   4 +-
 test/lib/completions/kdvi.exp                 |   4 +-
 test/lib/completions/kill.exp                 |   4 +-
 test/lib/completions/killall.exp              |   4 +-
 test/lib/completions/kldload.exp              |   4 +-
 test/lib/completions/kldunload.exp            |   4 +-
 test/lib/completions/kpdf.exp                 |   4 +-
 test/lib/completions/kplayer.exp              |   4 +-
 test/lib/completions/larch.exp                |   4 +-
 test/lib/completions/ld.exp                   |   4 +-
 test/lib/completions/ldd.exp                  |   4 +-
 test/lib/completions/less.exp                 |   4 +-
 test/lib/completions/lftp.exp                 |   4 +-
 test/lib/completions/lftpget.exp              |   4 +-
 test/lib/completions/lilo.exp                 |   4 +-
 test/lib/completions/links.exp                |   4 +-
 test/lib/completions/lisp.exp                 |   4 +-
 test/lib/completions/list_admins.exp          |   4 +-
 test/lib/completions/list_lists.exp           |   4 +-
 test/lib/completions/list_members.exp         |   4 +-
 test/lib/completions/list_owners.exp          |   4 +-
 test/lib/completions/ln.exp                   |   4 +-
 test/lib/completions/look.exp                 |   6 +-
 test/lib/completions/ls.exp                   |   6 +-
 test/lib/completions/lvchange.exp             |   4 +-
 test/lib/completions/lvcreate.exp             |   4 +-
 test/lib/completions/lvdisplay.exp            |   4 +-
 test/lib/completions/lvextend.exp             |   4 +-
 test/lib/completions/lvm.exp                  |   4 +-
 test/lib/completions/lvmdiskscan.exp          |   4 +-
 test/lib/completions/lvreduce.exp             |   4 +-
 test/lib/completions/lvremove.exp             |   4 +-
 test/lib/completions/lvrename.exp             |   4 +-
 test/lib/completions/lvresize.exp             |   4 +-
 test/lib/completions/lvs.exp                  |   4 +-
 test/lib/completions/lvscan.exp               |   4 +-
 test/lib/completions/lzma.exp                 |   4 +-
 test/lib/completions/lzop.exp                 |   4 +-
 test/lib/completions/m4.exp                   |   6 +-
 test/lib/completions/macof.exp                |   4 +-
 test/lib/completions/mailmanctl.exp           |   4 +-
 test/lib/completions/mailsnarf.exp            |   4 +-
 test/lib/completions/make.exp                 |   4 +-
 test/lib/completions/man.exp                  |   4 +-
 test/lib/completions/mc.exp                   |   4 +-
 test/lib/completions/mcrypt.exp               |   4 +-
 test/lib/completions/md5sum.exp               |   4 +-
 test/lib/completions/mdecrypt.exp             |   4 +-
 test/lib/completions/mencoder.exp             |   4 +-
 test/lib/completions/minicom.exp              |   4 +-
 test/lib/completions/mkdir.exp                |   4 +-
 test/lib/completions/mkfifo.exp               |   4 +-
 test/lib/completions/mkinitrd.exp             |   4 +-
 test/lib/completions/mkisofs.exp              |   8 +-
 test/lib/completions/mknod.exp                |   4 +-
 test/lib/completions/mmsitepass.exp           |   4 +-
 test/lib/completions/module.exp               |   4 +-
 test/lib/completions/mogrify.exp              |   4 +-
 test/lib/completions/montage.exp              |   4 +-
 test/lib/completions/mplayer.exp              |   4 +-
 test/lib/completions/msgsnarf.exp             |   4 +-
 test/lib/completions/mtx.exp                  |   4 +-
 test/lib/completions/mutt.exp                 |   4 +-
 test/lib/completions/muttng.exp               |   4 +-
 test/lib/completions/mv.exp                   |   4 +-
 test/lib/completions/mysqladmin.exp           |   4 +-
 test/lib/completions/ncftp.exp                |   4 +-
 test/lib/completions/netstat.exp              |   4 +-
 test/lib/completions/newlist.exp              |   4 +-
 test/lib/completions/nl.exp                   |   4 +-
 test/lib/completions/nm.exp                   |   4 +-
 test/lib/completions/ntpdate.exp              |   4 +-
 test/lib/completions/objcopy.exp              |   4 +-
 test/lib/completions/objdump.exp              |   4 +-
 test/lib/completions/od.exp                   |   4 +-
 test/lib/completions/openssl.exp              |   6 +-
 test/lib/completions/p4.exp                   |   4 +-
 test/lib/completions/pack200.exp              |   4 +-
 test/lib/completions/paste.exp                |   4 +-
 test/lib/completions/patch.exp                |   4 +-
 test/lib/completions/perl.exp                 |   4 +-
 test/lib/completions/perldoc.exp              |   6 +-
 test/lib/completions/pgrep.exp                |   4 +-
 test/lib/completions/pine.exp                 |   4 +-
 test/lib/completions/ping.exp                 |   4 +-
 test/lib/completions/pkg-config.exp           |   4 +-
 test/lib/completions/pkg_deinstall.exp        |   4 +-
 test/lib/completions/pkg_delete.exp           |   4 +-
 test/lib/completions/pkg_info.exp             |   4 +-
 test/lib/completions/pkill.exp                |   4 +-
 test/lib/completions/portinstall.exp          |   4 +-
 test/lib/completions/portupgrade.exp          |   4 +-
 test/lib/completions/povray.exp               |   4 +-
 test/lib/completions/pr.exp                   |   4 +-
 test/lib/completions/psql.exp                 |   4 +-
 test/lib/completions/ptx.exp                  |   4 +-
 test/lib/completions/pvchange.exp             |   4 +-
 test/lib/completions/pvcreate.exp             |   4 +-
 test/lib/completions/pvdisplay.exp            |   4 +-
 test/lib/completions/pvmove.exp               |   4 +-
 test/lib/completions/pvremove.exp             |   4 +-
 test/lib/completions/pvs.exp                  |   4 +-
 test/lib/completions/pvscan.exp               |   4 +-
 test/lib/completions/python.exp               |   4 +-
 test/lib/completions/qrunner.exp              |   4 +-
 test/lib/completions/querybts.exp             |   4 +-
 test/lib/completions/rcs.exp                  |   4 +-
 test/lib/completions/rcsdiff.exp              |   4 +-
 test/lib/completions/rdict.exp                |   4 +-
 test/lib/completions/readelf.exp              |   4 +-
 test/lib/completions/readonly.exp             |   4 +-
 test/lib/completions/remove_members.exp       |   4 +-
 test/lib/completions/removepkg.exp            |   4 +-
 test/lib/completions/renice.exp               |   8 +-
 test/lib/completions/reportbug.exp            |   4 +-
 test/lib/completions/ri.exp                   |   4 +-
 test/lib/completions/rlog.exp                 |   4 +-
 test/lib/completions/rm.exp                   |   4 +-
 test/lib/completions/rmdir.exp                |   4 +-
 test/lib/completions/rmlist.exp               |   4 +-
 test/lib/completions/rpcdebug.exp             |   4 +-
 test/lib/completions/rpm.exp                  |   6 +-
 test/lib/completions/rsync.exp                |   4 +-
 test/lib/completions/rtcwake.exp              |   4 +-
 test/lib/completions/sbcl-mt.exp              |   4 +-
 test/lib/completions/sbcl.exp                 |   4 +-
 test/lib/completions/scp.exp                  |  18 +-
 test/lib/completions/screen.exp               |   6 +-
 test/lib/completions/sed.exp                  |   6 +-
 test/lib/completions/seq.exp                  |   4 +-
 test/lib/completions/service.exp              |   4 +-
 test/lib/completions/set.exp                  |   4 +-
 test/lib/completions/sftp.exp                 |   8 +-
 test/lib/completions/sha1sum.exp              |   4 +-
 test/lib/completions/shar.exp                 |   4 +-
 test/lib/completions/sitecopy.exp             |   4 +-
 test/lib/completions/smartctl.exp             |   4 +-
 test/lib/completions/snownews.exp             |   4 +-
 test/lib/completions/sort.exp                 |   4 +-
 test/lib/completions/split.exp                |   6 +-
 test/lib/completions/spovray.exp              |   4 +-
 test/lib/completions/ssh.exp                  |  10 +-
 test/lib/completions/sshmitm.exp              |   4 +-
 test/lib/completions/sshow.exp                |   4 +-
 test/lib/completions/strace.exp               |   4 +-
 test/lib/completions/strip.exp                |   4 +-
 test/lib/completions/sudo.exp                 |   4 +-
 test/lib/completions/svk.exp                  |   4 +-
 test/lib/completions/svn.exp                  |   4 +-
 test/lib/completions/svnadmin.exp             |   4 +-
 test/lib/completions/svnlook.exp              |   4 +-
 test/lib/completions/sync_members.exp         |   4 +-
 test/lib/completions/sysctl.exp               |   6 +-
 test/lib/completions/tac.exp                  |   4 +-
 test/lib/completions/tail.exp                 |   6 +-
 test/lib/completions/tar.exp                  |   4 +-
 test/lib/completions/tcpkill.exp              |   4 +-
 test/lib/completions/tcpnice.exp              |   4 +-
 test/lib/completions/tee.exp                  |   4 +-
 test/lib/completions/texindex.exp             |   4 +-
 test/lib/completions/tightvncviewer.exp       |   4 +-
 test/lib/completions/time.exp                 |   4 +-
 test/lib/completions/touch.exp                |   6 +-
 test/lib/completions/tr.exp                   |   6 +-
 test/lib/completions/unace.exp                |   4 +-
 test/lib/completions/uname.exp                |   6 +-
 test/lib/completions/unexpand.exp             |   6 +-
 test/lib/completions/uniq.exp                 |   6 +-
 test/lib/completions/units.exp                |   6 +-
 test/lib/completions/unpack200.exp            |   4 +-
 test/lib/completions/unrar.exp                |   4 +-
 test/lib/completions/unset.exp                |   4 +-
 test/lib/completions/unshunt.exp              |   4 +-
 test/lib/completions/update-alternatives.exp  |   4 +-
 test/lib/completions/update-rc.d.exp          |   4 +-
 test/lib/completions/urlsnarf.exp             |   4 +-
 test/lib/completions/vdir.exp                 |   4 +-
 test/lib/completions/vgcfgbackup.exp          |   4 +-
 test/lib/completions/vgcfgrestore.exp         |   4 +-
 test/lib/completions/vgchange.exp             |   4 +-
 test/lib/completions/vgck.exp                 |   4 +-
 test/lib/completions/vgconvert.exp            |   4 +-
 test/lib/completions/vgcreate.exp             |   4 +-
 test/lib/completions/vgdisplay.exp            |   4 +-
 test/lib/completions/vgexport.exp             |   4 +-
 test/lib/completions/vgextend.exp             |   4 +-
 test/lib/completions/vgimport.exp             |   4 +-
 test/lib/completions/vgmerge.exp              |   4 +-
 test/lib/completions/vgmknodes.exp            |   4 +-
 test/lib/completions/vgreduce.exp             |   4 +-
 test/lib/completions/vgremove.exp             |   4 +-
 test/lib/completions/vgrename.exp             |   4 +-
 test/lib/completions/vgs.exp                  |   4 +-
 test/lib/completions/vgscan.exp               |   4 +-
 test/lib/completions/vgsplit.exp              |   4 +-
 test/lib/completions/vncviewer.exp            |   4 +-
 test/lib/completions/wc.exp                   |   6 +-
 test/lib/completions/webmitm.exp              |   4 +-
 test/lib/completions/wget.exp                 |   4 +-
 test/lib/completions/who.exp                  |   6 +-
 test/lib/completions/withlist.exp             |   4 +-
 test/lib/completions/wol.exp                  |   4 +-
 test/lib/completions/wtf.exp                  |   4 +-
 test/lib/completions/wvdial.exp               |   4 +-
 test/lib/completions/xhost.exp                |  22 +--
 test/lib/completions/xmllint.exp              |   4 +-
 test/lib/completions/xmlwf.exp                |   4 +-
 test/lib/completions/xmms.exp                 |   4 +-
 test/lib/completions/xpovray.exp              |   4 +-
 test/lib/completions/xrandr.exp               |   4 +-
 test/lib/completions/xsltproc.exp             |   4 +-
 test/lib/completions/xvnc4viewer.exp          |   4 +-
 test/lib/completions/xz.exp                   |   4 +-
 test/lib/completions/ypcat.exp                |   4 +-
 test/lib/completions/ypmatch.exp              |   4 +-
 test/lib/completions/yum-arch.exp             |   4 +-
 test/lib/completions/yum.exp                  |   4 +-
 test/lib/library.exp                          | 156 +++++++++---------
 test/unit/__expand_tilde_by_ref.exp           |   4 +-
 test/unit/_count_args.exp                     |   4 +-
 test/unit/_get_comp_words_by_ref.exp          |  30 ++--
 test/unit/_get_cword.exp                      |  30 ++--
 test/unit/_known_hosts_real.exp               |  10 +-
 test/unit/compgen.exp                         |   8 +-
 363 files changed, 904 insertions(+), 906 deletions(-)

diff --git a/test/config/default.exp b/test/config/default.exp
index d1c04e71..029f11d5 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -1,23 +1,23 @@
-    # Set default expect fallback routines
+# Set default expect fallback routines
 expect_after {
     eof {
         if {[info exists test]} {
             fail "$test at eof" 
         } else {
             fail "[info level 1] at eof" 
-        }; # if
-    }; # eof
+        }
+    }
     timeout {
         if {[info exists test]} {
             fail "$test at timeout" 
         } else {
             fail "[info level 1] at timeout" 
-        }; # if
-    }; # timeout
-}; # expect_after()
+        }
+    }
+}
 
 
-    # Call tool_start(), if available
+# Call tool_start(), if available
 if { [info procs "${tool}_start"] != "" } {
     ${tool}_start
-}; # if
+}
diff --git a/test/lib/completions/a2ps.exp b/test/lib/completions/a2ps.exp
index 796e14cc..77cd07f5 100644
--- a/test/lib/completions/a2ps.exp
+++ b/test/lib/completions/a2ps.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/abook.exp b/test/lib/completions/abook.exp
index 3f4e301f..43f62729 100644
--- a/test/lib/completions/abook.exp
+++ b/test/lib/completions/abook.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/acroread.exp b/test/lib/completions/acroread.exp
index 4f11f905..f1754e98 100644
--- a/test/lib/completions/acroread.exp
+++ b/test/lib/completions/acroread.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     save_env
     assert_bash_exec "touch fixtures/shared/default/t.pdf";  # Create temporary files
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec "rm fixtures/shared/default/t.pdf";  # Remove temporary files
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/add_members.exp b/test/lib/completions/add_members.exp
index 02cd762d..46c7a688 100644
--- a/test/lib/completions/add_members.exp
+++ b/test/lib/completions/add_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/alias.exp b/test/lib/completions/alias.exp
index e6b88d00..9dba4e62 100644
--- a/test/lib/completions/alias.exp
+++ b/test/lib/completions/alias.exp
@@ -3,13 +3,13 @@ proc setup {} {
     assert_bash_exec "alias foo=bar"
     assert_bash_exec "alias bar='foo foo'"
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec "unalias -a";  # Remove all aliases
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -34,7 +34,7 @@ expect {
     -re "^alias foo\b\b\bfoo=foo\b\b\b$" { fail "$test: Wrong cursor position" }
     -re /@ { unresolved "$test" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/animate.exp
index 26065d25..12314d79 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/animate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ant.exp b/test/lib/completions/ant.exp
index 81294439..de57f24a 100644
--- a/test/lib/completions/ant.exp
+++ b/test/lib/completions/ant.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apache2ctl.exp b/test/lib/completions/apache2ctl.exp
index e63abb16..88e53fc2 100644
--- a/test/lib/completions/apache2ctl.exp
+++ b/test/lib/completions/apache2ctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-build.exp b/test/lib/completions/apt-build.exp
index fd09d0eb..01ff04b4 100644
--- a/test/lib/completions/apt-build.exp
+++ b/test/lib/completions/apt-build.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-cache.exp b/test/lib/completions/apt-cache.exp
index 5336beab..63be48a8 100644
--- a/test/lib/completions/apt-cache.exp
+++ b/test/lib/completions/apt-cache.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-get.exp b/test/lib/completions/apt-get.exp
index 6bd0f3a2..66887bd0 100644
--- a/test/lib/completions/apt-get.exp
+++ b/test/lib/completions/apt-get.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/aptitude.exp b/test/lib/completions/aptitude.exp
index dde6d26e..e6e82abb 100644
--- a/test/lib/completions/aptitude.exp
+++ b/test/lib/completions/aptitude.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/arch.exp b/test/lib/completions/arch.exp
index 9f7114c4..0550c76b 100644
--- a/test/lib/completions/arch.exp
+++ b/test/lib/completions/arch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/arpspoof.exp b/test/lib/completions/arpspoof.exp
index 7db79f50..91ef5182 100644
--- a/test/lib/completions/arpspoof.exp
+++ b/test/lib/completions/arpspoof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/aspell.exp b/test/lib/completions/aspell.exp
index 4edeb03b..9dd5f61a 100644
--- a/test/lib/completions/aspell.exp
+++ b/test/lib/completions/aspell.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/autoconf.exp b/test/lib/completions/autoconf.exp
index 4a44b651..53b096db 100644
--- a/test/lib/completions/autoconf.exp
+++ b/test/lib/completions/autoconf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/automake.exp b/test/lib/completions/automake.exp
index cf27364a..f875da56 100644
--- a/test/lib/completions/automake.exp
+++ b/test/lib/completions/automake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/autorpm.exp b/test/lib/completions/autorpm.exp
index 99b743ca..2ae4ff80 100644
--- a/test/lib/completions/autorpm.exp
+++ b/test/lib/completions/autorpm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/awk.exp
index 4288adbf..260dabcc 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/awk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bash.exp b/test/lib/completions/bash.exp
index 4caf58fc..bf01e76d 100644
--- a/test/lib/completions/bash.exp
+++ b/test/lib/completions/bash.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bc.exp b/test/lib/completions/bc.exp
index c437d037..23c22b62 100644
--- a/test/lib/completions/bc.exp
+++ b/test/lib/completions/bc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bison.exp b/test/lib/completions/bison.exp
index a3dea1e0..4bbb59fa 100644
--- a/test/lib/completions/bison.exp
+++ b/test/lib/completions/bison.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bk.exp b/test/lib/completions/bk.exp
index 4915136e..b652e6b0 100644
--- a/test/lib/completions/bk.exp
+++ b/test/lib/completions/bk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/brctl.exp b/test/lib/completions/brctl.exp
index d87002a2..57c9edff 100644
--- a/test/lib/completions/brctl.exp
+++ b/test/lib/completions/brctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadcurses.py.exp b/test/lib/completions/btdownloadcurses.py.exp
index 9dc0ba5a..71a00de7 100644
--- a/test/lib/completions/btdownloadcurses.py.exp
+++ b/test/lib/completions/btdownloadcurses.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadgui.py.exp b/test/lib/completions/btdownloadgui.py.exp
index 03897a53..65f56776 100644
--- a/test/lib/completions/btdownloadgui.py.exp
+++ b/test/lib/completions/btdownloadgui.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadheadless.py.exp b/test/lib/completions/btdownloadheadless.py.exp
index 69c62950..3c833bb8 100644
--- a/test/lib/completions/btdownloadheadless.py.exp
+++ b/test/lib/completions/btdownloadheadless.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bzip2.exp b/test/lib/completions/bzip2.exp
index e5389a2a..2813dd0e 100644
--- a/test/lib/completions/bzip2.exp
+++ b/test/lib/completions/bzip2.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/c++.exp b/test/lib/completions/c++.exp
index 1fe4bb13..4dffb042 100644
--- a/test/lib/completions/c++.exp
+++ b/test/lib/completions/c++.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cancel.exp b/test/lib/completions/cancel.exp
index 24ca47c4..fc2600ba 100644
--- a/test/lib/completions/cancel.exp
+++ b/test/lib/completions/cancel.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -22,7 +22,7 @@ if {[assert_exec {lp -H hold fixtures/shared/default/foo} job "" "untested"]} {
     assert_complete $jobs "cancel "
         # Remove/cancel the test print job
     assert_exec "cancel $job_id"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cardctl.exp b/test/lib/completions/cardctl.exp
index b5d7e88d..9df90f48 100644
--- a/test/lib/completions/cardctl.exp
+++ b/test/lib/completions/cardctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cat.exp b/test/lib/completions/cat.exp
index 46e8775f..01b3659e 100644
--- a/test/lib/completions/cat.exp
+++ b/test/lib/completions/cat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cc.exp b/test/lib/completions/cc.exp
index 1d63d006..eb722dea 100644
--- a/test/lib/completions/cc.exp
+++ b/test/lib/completions/cc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 58233575..2101f035 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -29,7 +29,7 @@ expect {
 	-re "^cd fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cdrecord.exp b/test/lib/completions/cdrecord.exp
index d369f79d..192d2ded 100644
--- a/test/lib/completions/cdrecord.exp
+++ b/test/lib/completions/cdrecord.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/change_pw.exp b/test/lib/completions/change_pw.exp
index ca9bcdbd..28301941 100644
--- a/test/lib/completions/change_pw.exp
+++ b/test/lib/completions/change_pw.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/check_db.exp b/test/lib/completions/check_db.exp
index ca59a715..fe34ead2 100644
--- a/test/lib/completions/check_db.exp
+++ b/test/lib/completions/check_db.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/check_perms.exp b/test/lib/completions/check_perms.exp
index a58995b0..b40b78fc 100644
--- a/test/lib/completions/check_perms.exp
+++ b/test/lib/completions/check_perms.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chgrp.exp b/test/lib/completions/chgrp.exp
index 8dfeea79..e9238bde 100644
--- a/test/lib/completions/chgrp.exp
+++ b/test/lib/completions/chgrp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chkconfig.exp b/test/lib/completions/chkconfig.exp
index e7469b34..dae3b3bd 100644
--- a/test/lib/completions/chkconfig.exp
+++ b/test/lib/completions/chkconfig.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chown.exp b/test/lib/completions/chown.exp
index 953b2b02..a758cc1d 100644
--- a/test/lib/completions/chown.exp
+++ b/test/lib/completions/chown.exp
@@ -1,10 +1,10 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chsh.exp b/test/lib/completions/chsh.exp
index 99262a2c..a26ac93f 100644
--- a/test/lib/completions/chsh.exp
+++ b/test/lib/completions/chsh.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ci.exp b/test/lib/completions/ci.exp
index 09105eec..15ef2ecc 100644
--- a/test/lib/completions/ci.exp
+++ b/test/lib/completions/ci.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/civclient.exp b/test/lib/completions/civclient.exp
index 8159c2bc..c0047468 100644
--- a/test/lib/completions/civclient.exp
+++ b/test/lib/completions/civclient.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/civserver.exp b/test/lib/completions/civserver.exp
index df459688..3739f50e 100644
--- a/test/lib/completions/civserver.exp
+++ b/test/lib/completions/civserver.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cksfv.exp b/test/lib/completions/cksfv.exp
index a40a5023..2b9be04c 100644
--- a/test/lib/completions/cksfv.exp
+++ b/test/lib/completions/cksfv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cleanarch.exp b/test/lib/completions/cleanarch.exp
index e3145e81..a5f3bfe6 100644
--- a/test/lib/completions/cleanarch.exp
+++ b/test/lib/completions/cleanarch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/clisp.exp b/test/lib/completions/clisp.exp
index 2bc599ac..dfbad4f3 100644
--- a/test/lib/completions/clisp.exp
+++ b/test/lib/completions/clisp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/clone_member.exp b/test/lib/completions/clone_member.exp
index 34b4db57..d83d73bc 100644
--- a/test/lib/completions/clone_member.exp
+++ b/test/lib/completions/clone_member.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/co.exp b/test/lib/completions/co.exp
index 49fe3a64..215268b6 100644
--- a/test/lib/completions/co.exp
+++ b/test/lib/completions/co.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/composite.exp b/test/lib/completions/composite.exp
index e39ce72f..aba9af3b 100644
--- a/test/lib/completions/composite.exp
+++ b/test/lib/completions/composite.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/config_list.exp b/test/lib/completions/config_list.exp
index 5246c860..27699239 100644
--- a/test/lib/completions/config_list.exp
+++ b/test/lib/completions/config_list.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/configure.exp b/test/lib/completions/configure.exp
index 74afba1b..b4399cb1 100644
--- a/test/lib/completions/configure.exp
+++ b/test/lib/completions/configure.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
index d8a77e35..07032040 100644
--- a/test/lib/completions/convert.exp
+++ b/test/lib/completions/convert.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cowsay.exp b/test/lib/completions/cowsay.exp
index dfbefe1a..382f400f 100644
--- a/test/lib/completions/cowsay.exp
+++ b/test/lib/completions/cowsay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cp.exp b/test/lib/completions/cp.exp
index 9fe46537..703bf263 100644
--- a/test/lib/completions/cp.exp
+++ b/test/lib/completions/cp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/cpio.exp
index b02f2719..93f6f3c1 100644
--- a/test/lib/completions/cpio.exp
+++ b/test/lib/completions/cpio.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/createdb.exp b/test/lib/completions/createdb.exp
index 1e5cdbe7..aafff1b6 100644
--- a/test/lib/completions/createdb.exp
+++ b/test/lib/completions/createdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/crontab.exp b/test/lib/completions/crontab.exp
index b7398e62..18e2269f 100644
--- a/test/lib/completions/crontab.exp
+++ b/test/lib/completions/crontab.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cryptsetup.exp b/test/lib/completions/cryptsetup.exp
index e94c3ac1..4c20bc5d 100644
--- a/test/lib/completions/cryptsetup.exp
+++ b/test/lib/completions/cryptsetup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/csplit.exp b/test/lib/completions/csplit.exp
index 3a66a627..87b89dea 100644
--- a/test/lib/completions/csplit.exp
+++ b/test/lib/completions/csplit.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cut.exp b/test/lib/completions/cut.exp
index b9bcf6c5..edb558ea 100644
--- a/test/lib/completions/cut.exp
+++ b/test/lib/completions/cut.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
index 2a26da8e..f6853946 100644
--- a/test/lib/completions/cvs.exp
+++ b/test/lib/completions/cvs.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     save_env
     assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
     assert_env_unmodified {
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ send "$cmd\t"
 expect {
     -re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
     default { fail "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cvsps.exp b/test/lib/completions/cvsps.exp
index 1fd4a0a9..def4a11b 100644
--- a/test/lib/completions/cvsps.exp
+++ b/test/lib/completions/cvsps.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     save_env
     assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
     assert_env_unmodified {
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ send "$cmd\t"
 expect {
     -re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
     default { fail "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/date.exp b/test/lib/completions/date.exp
index 9d75f5f3..ee970cf7 100644
--- a/test/lib/completions/date.exp
+++ b/test/lib/completions/date.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dcop.exp b/test/lib/completions/dcop.exp
index 6ed800c5..1e27346b 100644
--- a/test/lib/completions/dcop.exp
+++ b/test/lib/completions/dcop.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {dcop} words]} {
     assert_complete $words "dcop "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/dd.exp b/test/lib/completions/dd.exp
index 400dd143..e02e037c 100644
--- a/test/lib/completions/dd.exp
+++ b/test/lib/completions/dd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -24,7 +24,7 @@ expect -ex "$cmd"
 expect {
     -re "^=$" { pass $test }
     -re {^\\=$} { xfail $test }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/df.exp b/test/lib/completions/df.exp
index 487d70a9..acf212a9 100644
--- a/test/lib/completions/df.exp
+++ b/test/lib/completions/df.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dhclient.exp b/test/lib/completions/dhclient.exp
index 42c14c82..6caff5fc 100644
--- a/test/lib/completions/dhclient.exp
+++ b/test/lib/completions/dhclient.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dict.exp b/test/lib/completions/dict.exp
index 32fb4988..402e0c5c 100644
--- a/test/lib/completions/dict.exp
+++ b/test/lib/completions/dict.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/diff.exp b/test/lib/completions/diff.exp
index c009f640..918bf7fd 100644
--- a/test/lib/completions/diff.exp
+++ b/test/lib/completions/diff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dir.exp b/test/lib/completions/dir.exp
index 6e20d37d..c9f61cd5 100644
--- a/test/lib/completions/dir.exp
+++ b/test/lib/completions/dir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/display.exp b/test/lib/completions/display.exp
index 9a9d6901..e9fe766a 100644
--- a/test/lib/completions/display.exp
+++ b/test/lib/completions/display.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dnsspoof.exp b/test/lib/completions/dnsspoof.exp
index 3223a349..4aefb956 100644
--- a/test/lib/completions/dnsspoof.exp
+++ b/test/lib/completions/dnsspoof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-deb.exp b/test/lib/completions/dpkg-deb.exp
index c8656610..37ece08d 100644
--- a/test/lib/completions/dpkg-deb.exp
+++ b/test/lib/completions/dpkg-deb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-reconfigure.exp b/test/lib/completions/dpkg-reconfigure.exp
index 267594be..0212666b 100644
--- a/test/lib/completions/dpkg-reconfigure.exp
+++ b/test/lib/completions/dpkg-reconfigure.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-source.exp b/test/lib/completions/dpkg-source.exp
index a21eff45..a42759b9 100644
--- a/test/lib/completions/dpkg-source.exp
+++ b/test/lib/completions/dpkg-source.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg.exp b/test/lib/completions/dpkg.exp
index 2bd1fb6e..f358e172 100644
--- a/test/lib/completions/dpkg.exp
+++ b/test/lib/completions/dpkg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -20,7 +20,7 @@ sync_after_int
     # Build list of installed packages
 if {[assert_exec {dpkg --get-selections | command grep \[\[:space:\]\]install$ | cut -f1} packages]} {
     assert_complete $packages "dpkg -L "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/dropdb.exp b/test/lib/completions/dropdb.exp
index e78a2ba7..8f2d5bfb 100644
--- a/test/lib/completions/dropdb.exp
+++ b/test/lib/completions/dropdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dselect.exp b/test/lib/completions/dselect.exp
index f6257294..634db05e 100644
--- a/test/lib/completions/dselect.exp
+++ b/test/lib/completions/dselect.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dsniff.exp b/test/lib/completions/dsniff.exp
index a0cc43ac..cb8912b6 100644
--- a/test/lib/completions/dsniff.exp
+++ b/test/lib/completions/dsniff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/du.exp b/test/lib/completions/du.exp
index d1ffa8ca..6ddeb9b2 100644
--- a/test/lib/completions/du.exp
+++ b/test/lib/completions/du.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dumpdb.exp b/test/lib/completions/dumpdb.exp
index 240214b3..5b617b11 100644
--- a/test/lib/completions/dumpdb.exp
+++ b/test/lib/completions/dumpdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/enscript.exp b/test/lib/completions/enscript.exp
index 7fefabdd..c859b50f 100644
--- a/test/lib/completions/enscript.exp
+++ b/test/lib/completions/enscript.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/env.exp b/test/lib/completions/env.exp
index f03f5395..4f213748 100644
--- a/test/lib/completions/env.exp
+++ b/test/lib/completions/env.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {env --help} "" "" "unsupported"]} {
     assert_complete_any "env --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/evince.exp b/test/lib/completions/evince.exp
index 22279a26..607c4428 100644
--- a/test/lib/completions/evince.exp
+++ b/test/lib/completions/evince.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/expand.exp b/test/lib/completions/expand.exp
index d5cd6b17..76b6eafa 100644
--- a/test/lib/completions/expand.exp
+++ b/test/lib/completions/expand.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {expand --help} "" "" "unsupported"]} {
     assert_complete_any "expand --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/filesnarf.exp b/test/lib/completions/filesnarf.exp
index 53cf01e4..03755056 100644
--- a/test/lib/completions/filesnarf.exp
+++ b/test/lib/completions/filesnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/find.exp b/test/lib/completions/find.exp
index 4b1728dc..aab08225 100644
--- a/test/lib/completions/find.exp
+++ b/test/lib/completions/find.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
@@ -50,28 +50,26 @@ sync_after_int
 
 
 set test "-uid should complete uids"
-    # Complete
 set cmd "find -uid "
 send "$cmd\t"
 expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
 
 
 set test "-gid should complete gids"
-    # Complete
 set cmd "find -gid "
 send "$cmd\t"
 expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/find_member.exp b/test/lib/completions/find_member.exp
index 58fac7d2..55672091 100644
--- a/test/lib/completions/find_member.exp
+++ b/test/lib/completions/find_member.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index 30f2b080..ae86a2d9 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -16,7 +16,7 @@ set test "Tab should complete usernames"
 set users {}
 foreach u [exec bash -c "compgen -A user"] {
     lappend users $u
-}; # foreach
+}
 assert_complete $users "finger " $test
 
 
@@ -45,9 +45,9 @@ foreach h [get_known_hosts] {
         if {$first == $char && [lsearch -exact $hosts "test@$h"] == -1} {
             # Prefix hosts with username 'test@'
             lappend hosts "test@$h"
-        }; # if
-    }; # if
-}; # foreach
+        }
+    }
+}
 assert_complete $hosts "finger test@$char" $test
 
 
diff --git a/test/lib/completions/fmt.exp b/test/lib/completions/fmt.exp
index 28570682..7d3cc17f 100644
--- a/test/lib/completions/fmt.exp
+++ b/test/lib/completions/fmt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {fmt --help} "" "" "unsupported"]} {
     assert_complete_any "fmt -"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/fold.exp b/test/lib/completions/fold.exp
index a5230b03..f447f08b 100644
--- a/test/lib/completions/fold.exp
+++ b/test/lib/completions/fold.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {fold --help} "" "" "unsupported"]} {
     assert_complete_any "fold --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/g++.exp b/test/lib/completions/g++.exp
index 4dc2591a..4dbe73f4 100644
--- a/test/lib/completions/g++.exp
+++ b/test/lib/completions/g++.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/g4.exp b/test/lib/completions/g4.exp
index 203de061..7d575f10 100644
--- a/test/lib/completions/g4.exp
+++ b/test/lib/completions/g4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/g77.exp b/test/lib/completions/g77.exp
index 8802aca9..e23745b7 100644
--- a/test/lib/completions/g77.exp
+++ b/test/lib/completions/g77.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcc.exp b/test/lib/completions/gcc.exp
index 8e52a120..00097cc2 100644
--- a/test/lib/completions/gcc.exp
+++ b/test/lib/completions/gcc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcj.exp b/test/lib/completions/gcj.exp
index db52d59a..cde07700 100644
--- a/test/lib/completions/gcj.exp
+++ b/test/lib/completions/gcj.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcl.exp b/test/lib/completions/gcl.exp
index 7cead846..1846d0d1 100644
--- a/test/lib/completions/gcl.exp
+++ b/test/lib/completions/gcl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gdb.exp b/test/lib/completions/gdb.exp
index 982f0878..2e389edb 100644
--- a/test/lib/completions/gdb.exp
+++ b/test/lib/completions/gdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/genaliases.exp b/test/lib/completions/genaliases.exp
index 064eb386..bb4d5e0e 100644
--- a/test/lib/completions/genaliases.exp
+++ b/test/lib/completions/genaliases.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/getent.exp b/test/lib/completions/getent.exp
index 121f3b38..6500b22d 100644
--- a/test/lib/completions/getent.exp
+++ b/test/lib/completions/getent.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gkrellm.exp b/test/lib/completions/gkrellm.exp
index f8b0dd4d..009770fc 100644
--- a/test/lib/completions/gkrellm.exp
+++ b/test/lib/completions/gkrellm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gmplayer.exp b/test/lib/completions/gmplayer.exp
index d9032698..a110cb2f 100644
--- a/test/lib/completions/gmplayer.exp
+++ b/test/lib/completions/gmplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gnatmake.exp b/test/lib/completions/gnatmake.exp
index 902aa062..bad4da33 100644
--- a/test/lib/completions/gnatmake.exp
+++ b/test/lib/completions/gnatmake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gpc.exp b/test/lib/completions/gpc.exp
index 6c4d0383..71eddacc 100644
--- a/test/lib/completions/gpc.exp
+++ b/test/lib/completions/gpc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gperf.exp b/test/lib/completions/gperf.exp
index aa24333e..1cf77678 100644
--- a/test/lib/completions/gperf.exp
+++ b/test/lib/completions/gperf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gpg.exp b/test/lib/completions/gpg.exp
index 29fd2244..ea6805fa 100644
--- a/test/lib/completions/gpg.exp
+++ b/test/lib/completions/gpg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gprof.exp b/test/lib/completions/gprof.exp
index 592786af..996a1efd 100644
--- a/test/lib/completions/gprof.exp
+++ b/test/lib/completions/gprof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {gprof --help} "" "" "unsupported"]} {
     assert_complete_any "gprof --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/grep.exp b/test/lib/completions/grep.exp
index 3814df71..c94ae727 100644
--- a/test/lib/completions/grep.exp
+++ b/test/lib/completions/grep.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/grub.exp b/test/lib/completions/grub.exp
index 9578e789..b88d1f26 100644
--- a/test/lib/completions/grub.exp
+++ b/test/lib/completions/grub.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gzip.exp b/test/lib/completions/gzip.exp
index f212c61a..32acf428 100644
--- a/test/lib/completions/gzip.exp
+++ b/test/lib/completions/gzip.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "^$cmd\r\n.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/hcitool.exp b/test/lib/completions/hcitool.exp
index 9283adff..e6ae0032 100644
--- a/test/lib/completions/hcitool.exp
+++ b/test/lib/completions/hcitool.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/head.exp b/test/lib/completions/head.exp
index 0d4f6a20..7edb8a1b 100644
--- a/test/lib/completions/head.exp
+++ b/test/lib/completions/head.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {head --help} "" "" "unsupported"]} {
     assert_complete_any "head --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/hping2.exp b/test/lib/completions/hping2.exp
index 03af8c96..8919626d 100644
--- a/test/lib/completions/hping2.exp
+++ b/test/lib/completions/hping2.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iconv.exp b/test/lib/completions/iconv.exp
index 420e923c..dcce330f 100644
--- a/test/lib/completions/iconv.exp
+++ b/test/lib/completions/iconv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/id.exp b/test/lib/completions/id.exp
index 155af52c..b03ee721 100644
--- a/test/lib/completions/id.exp
+++ b/test/lib/completions/id.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/identify.exp b/test/lib/completions/identify.exp
index 8f38ae47..3347c5cd 100644
--- a/test/lib/completions/identify.exp
+++ b/test/lib/completions/identify.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ifdown.exp b/test/lib/completions/ifdown.exp
index 68225bb9..7849f3f7 100644
--- a/test/lib/completions/ifdown.exp
+++ b/test/lib/completions/ifdown.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ifup.exp b/test/lib/completions/ifup.exp
index 9d717178..2c1c010e 100644
--- a/test/lib/completions/ifup.exp
+++ b/test/lib/completions/ifup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/indent.exp b/test/lib/completions/indent.exp
index e8fc32b1..5c5bb1c7 100644
--- a/test/lib/completions/indent.exp
+++ b/test/lib/completions/indent.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/info.exp b/test/lib/completions/info.exp
index ed769f1a..e7c79e6e 100644
--- a/test/lib/completions/info.exp
+++ b/test/lib/completions/info.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/inject.exp b/test/lib/completions/inject.exp
index 7c093146..4f95be23 100644
--- a/test/lib/completions/inject.exp
+++ b/test/lib/completions/inject.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/insmod.exp b/test/lib/completions/insmod.exp
index 8e83f0b4..a312c894 100644
--- a/test/lib/completions/insmod.exp
+++ b/test/lib/completions/insmod.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/invoke-rc.d.exp b/test/lib/completions/invoke-rc.d.exp
index 4dc9f1d8..d217d17e 100644
--- a/test/lib/completions/invoke-rc.d.exp
+++ b/test/lib/completions/invoke-rc.d.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ipsec.exp b/test/lib/completions/ipsec.exp
index 15617a16..74ef638c 100644
--- a/test/lib/completions/ipsec.exp
+++ b/test/lib/completions/ipsec.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ipv6calc.exp b/test/lib/completions/ipv6calc.exp
index 74ce95f7..42201f0c 100644
--- a/test/lib/completions/ipv6calc.exp
+++ b/test/lib/completions/ipv6calc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/irb.exp b/test/lib/completions/irb.exp
index 81bea6d2..720edfdf 100644
--- a/test/lib/completions/irb.exp
+++ b/test/lib/completions/irb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/isql.exp b/test/lib/completions/isql.exp
index 87e16bca..ca40faca 100644
--- a/test/lib/completions/isql.exp
+++ b/test/lib/completions/isql.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/ODBCINI=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwconfig.exp b/test/lib/completions/iwconfig.exp
index f09719d7..82ae11f3 100644
--- a/test/lib/completions/iwconfig.exp
+++ b/test/lib/completions/iwconfig.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwlist.exp b/test/lib/completions/iwlist.exp
index 80a2c367..43c919ef 100644
--- a/test/lib/completions/iwlist.exp
+++ b/test/lib/completions/iwlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwpriv.exp b/test/lib/completions/iwpriv.exp
index f3102cc5..86b1ee95 100644
--- a/test/lib/completions/iwpriv.exp
+++ b/test/lib/completions/iwpriv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwspy.exp b/test/lib/completions/iwspy.exp
index 5fa0bee5..2894ca4e 100644
--- a/test/lib/completions/iwspy.exp
+++ b/test/lib/completions/iwspy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/jar.exp b/test/lib/completions/jar.exp
index 0e11f684..d2cb476b 100644
--- a/test/lib/completions/jar.exp
+++ b/test/lib/completions/jar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/jarsigner.exp b/test/lib/completions/jarsigner.exp
index 075e0263..7ea7cb2e 100644
--- a/test/lib/completions/jarsigner.exp
+++ b/test/lib/completions/jarsigner.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 14610b2f..16b60054 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {CLASSPATH=$TESTDIR/fixtures/java/a:$TESTDIR/fixtures/java/bashcomp.jar}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/javac.exp b/test/lib/completions/javac.exp
index 6013de11..948fe8c8 100644
--- a/test/lib/completions/javac.exp
+++ b/test/lib/completions/javac.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/javadoc.exp b/test/lib/completions/javadoc.exp
index 40c922ca..0af8a3da 100644
--- a/test/lib/completions/javadoc.exp
+++ b/test/lib/completions/javadoc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/k3b.exp b/test/lib/completions/k3b.exp
index 86942d67..cde14b86 100644
--- a/test/lib/completions/k3b.exp
+++ b/test/lib/completions/k3b.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kdvi.exp b/test/lib/completions/kdvi.exp
index 0196049a..c7881da1 100644
--- a/test/lib/completions/kdvi.exp
+++ b/test/lib/completions/kdvi.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kill.exp b/test/lib/completions/kill.exp
index ca02650c..1e80fe69 100644
--- a/test/lib/completions/kill.exp
+++ b/test/lib/completions/kill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/killall.exp b/test/lib/completions/killall.exp
index 763c8e7d..ae8b3d60 100644
--- a/test/lib/completions/killall.exp
+++ b/test/lib/completions/killall.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kldload.exp b/test/lib/completions/kldload.exp
index 0493a10a..a1d87c97 100644
--- a/test/lib/completions/kldload.exp
+++ b/test/lib/completions/kldload.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kldunload.exp b/test/lib/completions/kldunload.exp
index 192159a5..476c5104 100644
--- a/test/lib/completions/kldunload.exp
+++ b/test/lib/completions/kldunload.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kpdf.exp b/test/lib/completions/kpdf.exp
index 010abcfb..4066c9c6 100644
--- a/test/lib/completions/kpdf.exp
+++ b/test/lib/completions/kpdf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kplayer.exp b/test/lib/completions/kplayer.exp
index 34c9b3bf..4fdfa672 100644
--- a/test/lib/completions/kplayer.exp
+++ b/test/lib/completions/kplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/larch.exp b/test/lib/completions/larch.exp
index 076016f2..cefcbe02 100644
--- a/test/lib/completions/larch.exp
+++ b/test/lib/completions/larch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ld.exp b/test/lib/completions/ld.exp
index 60377991..ee660fcb 100644
--- a/test/lib/completions/ld.exp
+++ b/test/lib/completions/ld.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ldd.exp b/test/lib/completions/ldd.exp
index e45d1df7..1c3239c7 100644
--- a/test/lib/completions/ldd.exp
+++ b/test/lib/completions/ldd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/less.exp b/test/lib/completions/less.exp
index 269c9b5c..78d6ef14 100644
--- a/test/lib/completions/less.exp
+++ b/test/lib/completions/less.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lftp.exp b/test/lib/completions/lftp.exp
index a49a1935..9fcc9a67 100644
--- a/test/lib/completions/lftp.exp
+++ b/test/lib/completions/lftp.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {HOME=$TESTDIR/fixtures/lftp}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lftpget.exp b/test/lib/completions/lftpget.exp
index 7d80216e..0eadb6e9 100644
--- a/test/lib/completions/lftpget.exp
+++ b/test/lib/completions/lftpget.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lilo.exp b/test/lib/completions/lilo.exp
index 505a1470..36ea2c66 100644
--- a/test/lib/completions/lilo.exp
+++ b/test/lib/completions/lilo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/links.exp b/test/lib/completions/links.exp
index 9f4896aa..4124e2f4 100644
--- a/test/lib/completions/links.exp
+++ b/test/lib/completions/links.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lisp.exp b/test/lib/completions/lisp.exp
index 21663628..5131b45d 100644
--- a/test/lib/completions/lisp.exp
+++ b/test/lib/completions/lisp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_admins.exp b/test/lib/completions/list_admins.exp
index e1c9c4dd..3b412136 100644
--- a/test/lib/completions/list_admins.exp
+++ b/test/lib/completions/list_admins.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_lists.exp b/test/lib/completions/list_lists.exp
index 789ab1a8..a62dca25 100644
--- a/test/lib/completions/list_lists.exp
+++ b/test/lib/completions/list_lists.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_members.exp b/test/lib/completions/list_members.exp
index c93b53d7..8c74cdfb 100644
--- a/test/lib/completions/list_members.exp
+++ b/test/lib/completions/list_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_owners.exp b/test/lib/completions/list_owners.exp
index c96e0229..65e3ba8e 100644
--- a/test/lib/completions/list_owners.exp
+++ b/test/lib/completions/list_owners.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ln.exp b/test/lib/completions/ln.exp
index 34786071..61405020 100644
--- a/test/lib/completions/ln.exp
+++ b/test/lib/completions/ln.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/look.exp b/test/lib/completions/look.exp
index 53a3c464..8f93db24 100644
--- a/test/lib/completions/look.exp
+++ b/test/lib/completions/look.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {look foo | grep ^foo} words]} {
     assert_complete $words "look foo"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index db2d41d3..171f6e14 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {ls --help} "" "" "unsupported"]} {
     assert_complete_any "ls --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/lvchange.exp b/test/lib/completions/lvchange.exp
index ec3886b8..6587a260 100644
--- a/test/lib/completions/lvchange.exp
+++ b/test/lib/completions/lvchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvcreate.exp b/test/lib/completions/lvcreate.exp
index 46dceb79..91cb0d81 100644
--- a/test/lib/completions/lvcreate.exp
+++ b/test/lib/completions/lvcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvdisplay.exp b/test/lib/completions/lvdisplay.exp
index 5a01a0e5..6fa9c294 100644
--- a/test/lib/completions/lvdisplay.exp
+++ b/test/lib/completions/lvdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvextend.exp b/test/lib/completions/lvextend.exp
index 24a63853..ded34695 100644
--- a/test/lib/completions/lvextend.exp
+++ b/test/lib/completions/lvextend.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvm.exp b/test/lib/completions/lvm.exp
index 1c67825e..91fe0dcd 100644
--- a/test/lib/completions/lvm.exp
+++ b/test/lib/completions/lvm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvmdiskscan.exp b/test/lib/completions/lvmdiskscan.exp
index 27e566d4..6553865f 100644
--- a/test/lib/completions/lvmdiskscan.exp
+++ b/test/lib/completions/lvmdiskscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvreduce.exp b/test/lib/completions/lvreduce.exp
index edd5150d..e2708f89 100644
--- a/test/lib/completions/lvreduce.exp
+++ b/test/lib/completions/lvreduce.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvremove.exp b/test/lib/completions/lvremove.exp
index 1cd63150..8ca1517b 100644
--- a/test/lib/completions/lvremove.exp
+++ b/test/lib/completions/lvremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvrename.exp b/test/lib/completions/lvrename.exp
index 51624222..17179ce9 100644
--- a/test/lib/completions/lvrename.exp
+++ b/test/lib/completions/lvrename.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvresize.exp b/test/lib/completions/lvresize.exp
index 830b9ab1..2b3e1044 100644
--- a/test/lib/completions/lvresize.exp
+++ b/test/lib/completions/lvresize.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvs.exp b/test/lib/completions/lvs.exp
index 8b239f5d..e531f7e9 100644
--- a/test/lib/completions/lvs.exp
+++ b/test/lib/completions/lvs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvscan.exp b/test/lib/completions/lvscan.exp
index 841fd0ed..7b09e5e1 100644
--- a/test/lib/completions/lvscan.exp
+++ b/test/lib/completions/lvscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
index 79d78854..56364d13 100644
--- a/test/lib/completions/lzma.exp
+++ b/test/lib/completions/lzma.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lzop.exp b/test/lib/completions/lzop.exp
index c33e814e..a7d3da25 100644
--- a/test/lib/completions/lzop.exp
+++ b/test/lib/completions/lzop.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/m4.exp b/test/lib/completions/m4.exp
index 2cc884b3..334132db 100644
--- a/test/lib/completions/m4.exp
+++ b/test/lib/completions/m4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {m4 --help} "" "" "unsupported"]} {
     assert_complete_any "m4 --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/macof.exp b/test/lib/completions/macof.exp
index e21b1e77..873ae1da 100644
--- a/test/lib/completions/macof.exp
+++ b/test/lib/completions/macof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mailmanctl.exp b/test/lib/completions/mailmanctl.exp
index a69b7650..2924806a 100644
--- a/test/lib/completions/mailmanctl.exp
+++ b/test/lib/completions/mailmanctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mailsnarf.exp b/test/lib/completions/mailsnarf.exp
index df9981b7..9fb937f3 100644
--- a/test/lib/completions/mailsnarf.exp
+++ b/test/lib/completions/mailsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/make.exp b/test/lib/completions/make.exp
index 90b9e68b..64a393da 100644
--- a/test/lib/completions/make.exp
+++ b/test/lib/completions/make.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index 62c14c86..47a6575f 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mc.exp b/test/lib/completions/mc.exp
index 866161ba..eb97246d 100644
--- a/test/lib/completions/mc.exp
+++ b/test/lib/completions/mc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mcrypt.exp b/test/lib/completions/mcrypt.exp
index bfc5d2d2..525ccbc3 100644
--- a/test/lib/completions/mcrypt.exp
+++ b/test/lib/completions/mcrypt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/md5sum.exp b/test/lib/completions/md5sum.exp
index 25290b56..54ed6416 100644
--- a/test/lib/completions/md5sum.exp
+++ b/test/lib/completions/md5sum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mdecrypt.exp b/test/lib/completions/mdecrypt.exp
index 4e49ae12..8d9d9f59 100644
--- a/test/lib/completions/mdecrypt.exp
+++ b/test/lib/completions/mdecrypt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mencoder.exp b/test/lib/completions/mencoder.exp
index 169dcb71..db29f66a 100644
--- a/test/lib/completions/mencoder.exp
+++ b/test/lib/completions/mencoder.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/minicom.exp b/test/lib/completions/minicom.exp
index 935502f1..dfc96c01 100644
--- a/test/lib/completions/minicom.exp
+++ b/test/lib/completions/minicom.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkdir.exp b/test/lib/completions/mkdir.exp
index 43dfec7e..a9333564 100644
--- a/test/lib/completions/mkdir.exp
+++ b/test/lib/completions/mkdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkfifo.exp b/test/lib/completions/mkfifo.exp
index c6343f8d..59412a2e 100644
--- a/test/lib/completions/mkfifo.exp
+++ b/test/lib/completions/mkfifo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkinitrd.exp b/test/lib/completions/mkinitrd.exp
index cfb316e5..007f278d 100644
--- a/test/lib/completions/mkinitrd.exp
+++ b/test/lib/completions/mkinitrd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkisofs.exp b/test/lib/completions/mkisofs.exp
index ad24ea06..98780b1e 100644
--- a/test/lib/completions/mkisofs.exp
+++ b/test/lib/completions/mkisofs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -25,7 +25,7 @@ expect {
     -re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
@@ -39,7 +39,7 @@ expect {
     -re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/mknod.exp b/test/lib/completions/mknod.exp
index 2c58cade..145f4531 100644
--- a/test/lib/completions/mknod.exp
+++ b/test/lib/completions/mknod.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mmsitepass.exp b/test/lib/completions/mmsitepass.exp
index d69fa202..4dde214f 100644
--- a/test/lib/completions/mmsitepass.exp
+++ b/test/lib/completions/mmsitepass.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/module.exp b/test/lib/completions/module.exp
index a34667d4..5e36a6da 100644
--- a/test/lib/completions/module.exp
+++ b/test/lib/completions/module.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mogrify.exp b/test/lib/completions/mogrify.exp
index ef7e18ee..84ceeff5 100644
--- a/test/lib/completions/mogrify.exp
+++ b/test/lib/completions/mogrify.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/montage.exp b/test/lib/completions/montage.exp
index 736609a5..4d85e1a4 100644
--- a/test/lib/completions/montage.exp
+++ b/test/lib/completions/montage.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mplayer.exp b/test/lib/completions/mplayer.exp
index 69e5d971..9230a86d 100644
--- a/test/lib/completions/mplayer.exp
+++ b/test/lib/completions/mplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/msgsnarf.exp b/test/lib/completions/msgsnarf.exp
index 74f458ff..c542e33e 100644
--- a/test/lib/completions/msgsnarf.exp
+++ b/test/lib/completions/msgsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mtx.exp b/test/lib/completions/mtx.exp
index a518d79f..1de15269 100644
--- a/test/lib/completions/mtx.exp
+++ b/test/lib/completions/mtx.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mutt.exp b/test/lib/completions/mutt.exp
index 6c727daf..91eb2457 100644
--- a/test/lib/completions/mutt.exp
+++ b/test/lib/completions/mutt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/muttng.exp b/test/lib/completions/muttng.exp
index 25a474ad..32239128 100644
--- a/test/lib/completions/muttng.exp
+++ b/test/lib/completions/muttng.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mv.exp b/test/lib/completions/mv.exp
index f2576df7..d65c4868 100644
--- a/test/lib/completions/mv.exp
+++ b/test/lib/completions/mv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mysqladmin.exp b/test/lib/completions/mysqladmin.exp
index 76381587..ae9b8ce8 100644
--- a/test/lib/completions/mysqladmin.exp
+++ b/test/lib/completions/mysqladmin.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
index ad71f226..52d70756 100644
--- a/test/lib/completions/ncftp.exp
+++ b/test/lib/completions/ncftp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/netstat.exp b/test/lib/completions/netstat.exp
index 0e6414d6..e4ef676c 100644
--- a/test/lib/completions/netstat.exp
+++ b/test/lib/completions/netstat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/newlist.exp b/test/lib/completions/newlist.exp
index bebf600d..0696ec5e 100644
--- a/test/lib/completions/newlist.exp
+++ b/test/lib/completions/newlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/nl.exp b/test/lib/completions/nl.exp
index 02076dff..b7255ac2 100644
--- a/test/lib/completions/nl.exp
+++ b/test/lib/completions/nl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/nm.exp b/test/lib/completions/nm.exp
index 551f49e9..9ce73d45 100644
--- a/test/lib/completions/nm.exp
+++ b/test/lib/completions/nm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ntpdate.exp b/test/lib/completions/ntpdate.exp
index 6a6456f4..7a7dd716 100644
--- a/test/lib/completions/ntpdate.exp
+++ b/test/lib/completions/ntpdate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/objcopy.exp b/test/lib/completions/objcopy.exp
index acb6539a..29be7e62 100644
--- a/test/lib/completions/objcopy.exp
+++ b/test/lib/completions/objcopy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/objdump.exp b/test/lib/completions/objdump.exp
index 5eec35d6..c1f62e35 100644
--- a/test/lib/completions/objdump.exp
+++ b/test/lib/completions/objdump.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/od.exp b/test/lib/completions/od.exp
index 5838218c..e2712d12 100644
--- a/test/lib/completions/od.exp
+++ b/test/lib/completions/od.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/openssl.exp b/test/lib/completions/openssl.exp
index 651e5e6d..25fc1367 100644
--- a/test/lib/completions/openssl.exp
+++ b/test/lib/completions/openssl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "^$cmd\r\n.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/p4.exp b/test/lib/completions/p4.exp
index 369d2c6b..20d8fb6e 100644
--- a/test/lib/completions/p4.exp
+++ b/test/lib/completions/p4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pack200.exp b/test/lib/completions/pack200.exp
index f96eff13..537bf327 100644
--- a/test/lib/completions/pack200.exp
+++ b/test/lib/completions/pack200.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/paste.exp b/test/lib/completions/paste.exp
index 3a4e93be..224d9dd9 100644
--- a/test/lib/completions/paste.exp
+++ b/test/lib/completions/paste.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/patch.exp b/test/lib/completions/patch.exp
index a44fa130..07e88f15 100644
--- a/test/lib/completions/patch.exp
+++ b/test/lib/completions/patch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 2199c994..e02bd454 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index b3ff83b3..d4461df9 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -29,7 +29,7 @@ expect {
     -re "perldoc File::File::" { fail "$test" }
     -re /@ { unresolved "$test" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/pgrep.exp b/test/lib/completions/pgrep.exp
index 63143acc..c27c4f21 100644
--- a/test/lib/completions/pgrep.exp
+++ b/test/lib/completions/pgrep.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pine.exp b/test/lib/completions/pine.exp
index 0a0c3f40..622bf064 100644
--- a/test/lib/completions/pine.exp
+++ b/test/lib/completions/pine.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ping.exp b/test/lib/completions/ping.exp
index b600849b..3e419966 100644
--- a/test/lib/completions/ping.exp
+++ b/test/lib/completions/ping.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg-config.exp b/test/lib/completions/pkg-config.exp
index 477dba08..adf9a301 100644
--- a/test/lib/completions/pkg-config.exp
+++ b/test/lib/completions/pkg-config.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_deinstall.exp b/test/lib/completions/pkg_deinstall.exp
index 8f3d8c3d..e61d0ce3 100644
--- a/test/lib/completions/pkg_deinstall.exp
+++ b/test/lib/completions/pkg_deinstall.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_delete.exp b/test/lib/completions/pkg_delete.exp
index b0c1a2a5..37ce4035 100644
--- a/test/lib/completions/pkg_delete.exp
+++ b/test/lib/completions/pkg_delete.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_info.exp b/test/lib/completions/pkg_info.exp
index 3f253ccf..ad8ed84e 100644
--- a/test/lib/completions/pkg_info.exp
+++ b/test/lib/completions/pkg_info.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkill.exp b/test/lib/completions/pkill.exp
index 0333fc94..6faddfc3 100644
--- a/test/lib/completions/pkill.exp
+++ b/test/lib/completions/pkill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/portinstall.exp b/test/lib/completions/portinstall.exp
index d70f5db6..9f44e96b 100644
--- a/test/lib/completions/portinstall.exp
+++ b/test/lib/completions/portinstall.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     assert_bash_exec {PORTSDIR=fixtures/pkgtools/ports ; sed -e s,PORTSDIR,$PORTSDIR,g $PORTSDIR/INDEX.dist > $PORTSDIR/INDEX ; cp $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec {rm fixtures/pkgtools/ports/INDEX fixtures/pkgtools/ports/INDEX-5}
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/portupgrade.exp b/test/lib/completions/portupgrade.exp
index cb583923..62b5789d 100644
--- a/test/lib/completions/portupgrade.exp
+++ b/test/lib/completions/portupgrade.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/povray.exp b/test/lib/completions/povray.exp
index 1efeeddb..30d58e48 100644
--- a/test/lib/completions/povray.exp
+++ b/test/lib/completions/povray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pr.exp b/test/lib/completions/pr.exp
index 5d7a96c3..478017b2 100644
--- a/test/lib/completions/pr.exp
+++ b/test/lib/completions/pr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/psql.exp b/test/lib/completions/psql.exp
index 56d56666..3dbffaf2 100644
--- a/test/lib/completions/psql.exp
+++ b/test/lib/completions/psql.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ptx.exp b/test/lib/completions/ptx.exp
index 2defe049..220243c3 100644
--- a/test/lib/completions/ptx.exp
+++ b/test/lib/completions/ptx.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvchange.exp b/test/lib/completions/pvchange.exp
index fd4b73d0..a43ae9cd 100644
--- a/test/lib/completions/pvchange.exp
+++ b/test/lib/completions/pvchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvcreate.exp b/test/lib/completions/pvcreate.exp
index 47cebf7a..6bc9d4eb 100644
--- a/test/lib/completions/pvcreate.exp
+++ b/test/lib/completions/pvcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvdisplay.exp b/test/lib/completions/pvdisplay.exp
index 151064cd..b9db558b 100644
--- a/test/lib/completions/pvdisplay.exp
+++ b/test/lib/completions/pvdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvmove.exp b/test/lib/completions/pvmove.exp
index 81c05e98..24d17006 100644
--- a/test/lib/completions/pvmove.exp
+++ b/test/lib/completions/pvmove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvremove.exp b/test/lib/completions/pvremove.exp
index dd145bf6..1febcf37 100644
--- a/test/lib/completions/pvremove.exp
+++ b/test/lib/completions/pvremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvs.exp b/test/lib/completions/pvs.exp
index 6e5527e1..e50501a3 100644
--- a/test/lib/completions/pvs.exp
+++ b/test/lib/completions/pvs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvscan.exp b/test/lib/completions/pvscan.exp
index e92cdbe0..d3b8ad33 100644
--- a/test/lib/completions/pvscan.exp
+++ b/test/lib/completions/pvscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/python.exp b/test/lib/completions/python.exp
index c9d70b43..57520cdf 100644
--- a/test/lib/completions/python.exp
+++ b/test/lib/completions/python.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/qrunner.exp b/test/lib/completions/qrunner.exp
index b8fcf191..0dec16cc 100644
--- a/test/lib/completions/qrunner.exp
+++ b/test/lib/completions/qrunner.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/querybts.exp b/test/lib/completions/querybts.exp
index dc75cd62..4ed09d8a 100644
--- a/test/lib/completions/querybts.exp
+++ b/test/lib/completions/querybts.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rcs.exp b/test/lib/completions/rcs.exp
index 19ae4d50..781ac37f 100644
--- a/test/lib/completions/rcs.exp
+++ b/test/lib/completions/rcs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rcsdiff.exp b/test/lib/completions/rcsdiff.exp
index 8383cdb9..23b009c6 100644
--- a/test/lib/completions/rcsdiff.exp
+++ b/test/lib/completions/rcsdiff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rdict.exp b/test/lib/completions/rdict.exp
index aa132617..5d6ad847 100644
--- a/test/lib/completions/rdict.exp
+++ b/test/lib/completions/rdict.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/readelf.exp b/test/lib/completions/readelf.exp
index a084a41e..c2d5ee5b 100644
--- a/test/lib/completions/readelf.exp
+++ b/test/lib/completions/readelf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/readonly.exp b/test/lib/completions/readonly.exp
index 84be3c96..cf64ca0a 100644
--- a/test/lib/completions/readonly.exp
+++ b/test/lib/completions/readonly.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/remove_members.exp b/test/lib/completions/remove_members.exp
index 63d6a70e..59f7b6c4 100644
--- a/test/lib/completions/remove_members.exp
+++ b/test/lib/completions/remove_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/removepkg.exp b/test/lib/completions/removepkg.exp
index 7cf98805..882f1e70 100644
--- a/test/lib/completions/removepkg.exp
+++ b/test/lib/completions/removepkg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/renice.exp b/test/lib/completions/renice.exp
index c91e0212..fdc859b4 100644
--- a/test/lib/completions/renice.exp
+++ b/test/lib/completions/renice.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
@@ -33,7 +33,7 @@ expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/reportbug.exp b/test/lib/completions/reportbug.exp
index 1f66df2c..660778f7 100644
--- a/test/lib/completions/reportbug.exp
+++ b/test/lib/completions/reportbug.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ri.exp b/test/lib/completions/ri.exp
index 160dc9a7..cd138ea0 100644
--- a/test/lib/completions/ri.exp
+++ b/test/lib/completions/ri.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rlog.exp b/test/lib/completions/rlog.exp
index cbc06857..87984a8d 100644
--- a/test/lib/completions/rlog.exp
+++ b/test/lib/completions/rlog.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rm.exp b/test/lib/completions/rm.exp
index ae670e83..f764a8e7 100644
--- a/test/lib/completions/rm.exp
+++ b/test/lib/completions/rm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rmdir.exp b/test/lib/completions/rmdir.exp
index 2b23a9c5..cc604761 100644
--- a/test/lib/completions/rmdir.exp
+++ b/test/lib/completions/rmdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rmlist.exp b/test/lib/completions/rmlist.exp
index 91519ee8..d530d117 100644
--- a/test/lib/completions/rmlist.exp
+++ b/test/lib/completions/rmlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rpcdebug.exp b/test/lib/completions/rpcdebug.exp
index 8629c947..7f1a1c2f 100644
--- a/test/lib/completions/rpcdebug.exp
+++ b/test/lib/completions/rpcdebug.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rpm.exp b/test/lib/completions/rpm.exp
index 3ed154a9..82ab28dc 100644
--- a/test/lib/completions/rpm.exp
+++ b/test/lib/completions/rpm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -20,7 +20,7 @@ sync_after_int
     # Build list of installed packages
 if {[assert_exec {rpm -qa --qf=%\{NAME\}\n | sort -u} packages]} {
     assert_complete $packages "rpm -q "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/rsync.exp b/test/lib/completions/rsync.exp
index fb301a35..221d090b 100644
--- a/test/lib/completions/rsync.exp
+++ b/test/lib/completions/rsync.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rtcwake.exp b/test/lib/completions/rtcwake.exp
index 0b9a974b..21c05eab 100644
--- a/test/lib/completions/rtcwake.exp
+++ b/test/lib/completions/rtcwake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sbcl-mt.exp b/test/lib/completions/sbcl-mt.exp
index 45e81f79..d328fec3 100644
--- a/test/lib/completions/sbcl-mt.exp
+++ b/test/lib/completions/sbcl-mt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sbcl.exp b/test/lib/completions/sbcl.exp
index b68b2dce..c6f908f6 100644
--- a/test/lib/completions/sbcl.exp
+++ b/test/lib/completions/sbcl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index efe2b686..e1f7336e 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -31,7 +31,7 @@ if {
         #       in `$HOME/.ssh/config' or `/etc/ssh_config'
     set host_pwd ""
     unsupported $test
-}; # if
+}
 
 
     # Try completion
@@ -41,7 +41,7 @@ sync_after_tab
 expect {
     -re "^$cmd$host_pwd.*$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
-}; # expect
+}
 
 
 sync_after_int
@@ -56,7 +56,7 @@ set test "Tab should complete known-hosts"
 set expected {}
 foreach host [get_hosts] {
     lappend expected "$host:"
-}; # foreach
+}
 lappend expected doo: gee: hus: ike:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
@@ -76,7 +76,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -88,7 +88,7 @@ set test "Config file containing space should work"
 set expected {}
 foreach host [get_hosts] {
     lappend expected "$host:"
-}; # foreach
+}
     # Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced  conf"
     # Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
 lappend expected doo: gee: hus: ike: jar:
@@ -105,12 +105,12 @@ if {[match_items [lsort -unique $expected] $test]} {
     expect {
         -re $prompt { pass "$test" }
         -re eof { unresolved "eof" }
-    }; # expect
+    }
 } else {
     # Expected failure (known bug) because of bash-4 bug in quoted words:
     # http://www.mail-archive.com/bug-bash@gnu.org/msg06095.html
     if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"}
-}; # if
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/screen.exp b/test/lib/completions/screen.exp
index 985862c1..a1a20138 100644
--- a/test/lib/completions/screen.exp
+++ b/test/lib/completions/screen.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
@@ -40,7 +40,7 @@ expect {
     }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sed.exp b/test/lib/completions/sed.exp
index 8764cfb8..dd480a60 100644
--- a/test/lib/completions/sed.exp
+++ b/test/lib/completions/sed.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {sed --help} "" "" "unsupported"]} {
     assert_complete_any "sed --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/seq.exp b/test/lib/completions/seq.exp
index b5333ef9..6e5ef8dc 100644
--- a/test/lib/completions/seq.exp
+++ b/test/lib/completions/seq.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/service.exp b/test/lib/completions/service.exp
index 917c5dcb..f3cf7355 100644
--- a/test/lib/completions/service.exp
+++ b/test/lib/completions/service.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/set.exp b/test/lib/completions/set.exp
index 2b2d40e9..c14ecff6 100644
--- a/test/lib/completions/set.exp
+++ b/test/lib/completions/set.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 24c37cb5..7a197c7c 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -36,7 +36,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -69,7 +69,7 @@ expect {
     -re "aced  conf" { xfail "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sha1sum.exp b/test/lib/completions/sha1sum.exp
index 17519087..c5983044 100644
--- a/test/lib/completions/sha1sum.exp
+++ b/test/lib/completions/sha1sum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/shar.exp b/test/lib/completions/shar.exp
index 7ace9d6e..604a2031 100644
--- a/test/lib/completions/shar.exp
+++ b/test/lib/completions/shar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sitecopy.exp b/test/lib/completions/sitecopy.exp
index 49b78918..7e0c87fe 100644
--- a/test/lib/completions/sitecopy.exp
+++ b/test/lib/completions/sitecopy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/smartctl.exp b/test/lib/completions/smartctl.exp
index a9eeb956..24919396 100644
--- a/test/lib/completions/smartctl.exp
+++ b/test/lib/completions/smartctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/snownews.exp b/test/lib/completions/snownews.exp
index 7502e587..c8ad6741 100644
--- a/test/lib/completions/snownews.exp
+++ b/test/lib/completions/snownews.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sort.exp b/test/lib/completions/sort.exp
index 20516cc8..a130bbc8 100644
--- a/test/lib/completions/sort.exp
+++ b/test/lib/completions/sort.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/split.exp b/test/lib/completions/split.exp
index b74da369..e13df49a 100644
--- a/test/lib/completions/split.exp
+++ b/test/lib/completions/split.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {split --help} "" "" "unsupported"]} {
     assert_complete_any "split --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/spovray.exp b/test/lib/completions/spovray.exp
index 30d81853..2b2c33de 100644
--- a/test/lib/completions/spovray.exp
+++ b/test/lib/completions/spovray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index 91955c1d..7a511eab 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ expect {
     -re $expected  { pass "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
@@ -45,7 +45,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -82,7 +82,7 @@ expect {
     -re "aced  conf" { xfail "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sshmitm.exp b/test/lib/completions/sshmitm.exp
index b8f8a2c9..13b50673 100644
--- a/test/lib/completions/sshmitm.exp
+++ b/test/lib/completions/sshmitm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sshow.exp b/test/lib/completions/sshow.exp
index 36a6cc2c..074d7b12 100644
--- a/test/lib/completions/sshow.exp
+++ b/test/lib/completions/sshow.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/strace.exp b/test/lib/completions/strace.exp
index 55004d20..933d1b48 100644
--- a/test/lib/completions/strace.exp
+++ b/test/lib/completions/strace.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/strip.exp b/test/lib/completions/strip.exp
index 46d9f362..00f4ab9c 100644
--- a/test/lib/completions/strip.exp
+++ b/test/lib/completions/strip.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index 1299a6da..e7a39162 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svk.exp b/test/lib/completions/svk.exp
index a08674dc..a794a008 100644
--- a/test/lib/completions/svk.exp
+++ b/test/lib/completions/svk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svn.exp b/test/lib/completions/svn.exp
index fe40d6f7..d1a08ae4 100644
--- a/test/lib/completions/svn.exp
+++ b/test/lib/completions/svn.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svnadmin.exp b/test/lib/completions/svnadmin.exp
index 35e07021..f20d52cf 100644
--- a/test/lib/completions/svnadmin.exp
+++ b/test/lib/completions/svnadmin.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svnlook.exp b/test/lib/completions/svnlook.exp
index 33b67052..114435ec 100644
--- a/test/lib/completions/svnlook.exp
+++ b/test/lib/completions/svnlook.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sync_members.exp b/test/lib/completions/sync_members.exp
index 4cb84ad8..817432bb 100644
--- a/test/lib/completions/sync_members.exp
+++ b/test/lib/completions/sync_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sysctl.exp b/test/lib/completions/sysctl.exp
index e1866f55..d163ea5a 100644
--- a/test/lib/completions/sysctl.exp
+++ b/test/lib/completions/sysctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {sysctl -N -a 2>/dev/null | grep ^kern | sort -u} values]} {
     assert_complete $values "sysctl kern"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tac.exp b/test/lib/completions/tac.exp
index 21230052..d4fe7937 100644
--- a/test/lib/completions/tac.exp
+++ b/test/lib/completions/tac.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tail.exp b/test/lib/completions/tail.exp
index c8a82d97..fd685b1a 100644
--- a/test/lib/completions/tail.exp
+++ b/test/lib/completions/tail.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {tail --help} "" "" "unsupported"]} {
     assert_complete_any "tail --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
index 43c60ff9..37f1ae4b 100644
--- a/test/lib/completions/tar.exp
+++ b/test/lib/completions/tar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tcpkill.exp b/test/lib/completions/tcpkill.exp
index e8cc9c10..d3a45e43 100644
--- a/test/lib/completions/tcpkill.exp
+++ b/test/lib/completions/tcpkill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tcpnice.exp b/test/lib/completions/tcpnice.exp
index 44bb59c6..b4b93097 100644
--- a/test/lib/completions/tcpnice.exp
+++ b/test/lib/completions/tcpnice.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tee.exp b/test/lib/completions/tee.exp
index c25057ba..1058bb8e 100644
--- a/test/lib/completions/tee.exp
+++ b/test/lib/completions/tee.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/texindex.exp b/test/lib/completions/texindex.exp
index d5b8cd77..43b4c09a 100644
--- a/test/lib/completions/texindex.exp
+++ b/test/lib/completions/texindex.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tightvncviewer.exp b/test/lib/completions/tightvncviewer.exp
index 6eba24c2..ee987f60 100644
--- a/test/lib/completions/tightvncviewer.exp
+++ b/test/lib/completions/tightvncviewer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/time.exp b/test/lib/completions/time.exp
index b114318b..3bed4fdf 100644
--- a/test/lib/completions/time.exp
+++ b/test/lib/completions/time.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/touch.exp b/test/lib/completions/touch.exp
index f0960ef7..61d22b33 100644
--- a/test/lib/completions/touch.exp
+++ b/test/lib/completions/touch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {touch --help} "" "" "unsupported"]} {
     assert_complete_any "touch --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tr.exp b/test/lib/completions/tr.exp
index 68b11a36..c10c8ba1 100644
--- a/test/lib/completions/tr.exp
+++ b/test/lib/completions/tr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {tr --help} "" "" "unsupported"]} {
     assert_complete_any "tr --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unace.exp b/test/lib/completions/unace.exp
index 0afbaafb..c9d7606e 100644
--- a/test/lib/completions/unace.exp
+++ b/test/lib/completions/unace.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/uname.exp b/test/lib/completions/uname.exp
index 2179dafd..0c363ab5 100644
--- a/test/lib/completions/uname.exp
+++ b/test/lib/completions/uname.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {uname --help} "" "" "unsupported"]} {
     assert_complete_any "uname --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unexpand.exp b/test/lib/completions/unexpand.exp
index 31822561..c9aecc25 100644
--- a/test/lib/completions/unexpand.exp
+++ b/test/lib/completions/unexpand.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {unexpand --help} "" "" "unsupported"]} {
     assert_complete_any "unexpand --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/uniq.exp b/test/lib/completions/uniq.exp
index 20dbcfac..d516106c 100644
--- a/test/lib/completions/uniq.exp
+++ b/test/lib/completions/uniq.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {uniq --help} "" "" "unsupported"]} {
     assert_complete_any "uniq --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/units.exp b/test/lib/completions/units.exp
index a40b5f3f..96ec91d1 100644
--- a/test/lib/completions/units.exp
+++ b/test/lib/completions/units.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {units --help} "" "" "unsupported"]} {
     assert_complete_any "units --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unpack200.exp b/test/lib/completions/unpack200.exp
index 845701dd..b4360491 100644
--- a/test/lib/completions/unpack200.exp
+++ b/test/lib/completions/unpack200.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unrar.exp b/test/lib/completions/unrar.exp
index e66e3c8b..b5e27b21 100644
--- a/test/lib/completions/unrar.exp
+++ b/test/lib/completions/unrar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unset.exp b/test/lib/completions/unset.exp
index a5e7fc9b..42e753cb 100644
--- a/test/lib/completions/unset.exp
+++ b/test/lib/completions/unset.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unshunt.exp b/test/lib/completions/unshunt.exp
index 964cac68..96cd5860 100644
--- a/test/lib/completions/unshunt.exp
+++ b/test/lib/completions/unshunt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/update-alternatives.exp b/test/lib/completions/update-alternatives.exp
index 10ff4e6d..b94d88c5 100644
--- a/test/lib/completions/update-alternatives.exp
+++ b/test/lib/completions/update-alternatives.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/update-rc.d.exp b/test/lib/completions/update-rc.d.exp
index 9c2c2464..f2eafea5 100644
--- a/test/lib/completions/update-rc.d.exp
+++ b/test/lib/completions/update-rc.d.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/urlsnarf.exp b/test/lib/completions/urlsnarf.exp
index c5b26922..ed543629 100644
--- a/test/lib/completions/urlsnarf.exp
+++ b/test/lib/completions/urlsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vdir.exp b/test/lib/completions/vdir.exp
index b525c382..c0e5ee43 100644
--- a/test/lib/completions/vdir.exp
+++ b/test/lib/completions/vdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcfgbackup.exp b/test/lib/completions/vgcfgbackup.exp
index 19ceeeca..b7e509a2 100644
--- a/test/lib/completions/vgcfgbackup.exp
+++ b/test/lib/completions/vgcfgbackup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcfgrestore.exp b/test/lib/completions/vgcfgrestore.exp
index e1c3c3b9..e40cd213 100644
--- a/test/lib/completions/vgcfgrestore.exp
+++ b/test/lib/completions/vgcfgrestore.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgchange.exp b/test/lib/completions/vgchange.exp
index 645eedb4..b6c0e1df 100644
--- a/test/lib/completions/vgchange.exp
+++ b/test/lib/completions/vgchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgck.exp b/test/lib/completions/vgck.exp
index 67209b15..b4d58aec 100644
--- a/test/lib/completions/vgck.exp
+++ b/test/lib/completions/vgck.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgconvert.exp b/test/lib/completions/vgconvert.exp
index 065c4828..362c44b6 100644
--- a/test/lib/completions/vgconvert.exp
+++ b/test/lib/completions/vgconvert.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcreate.exp b/test/lib/completions/vgcreate.exp
index 7c324e62..4cb7dd45 100644
--- a/test/lib/completions/vgcreate.exp
+++ b/test/lib/completions/vgcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgdisplay.exp b/test/lib/completions/vgdisplay.exp
index b6bc9125..6a8ed84d 100644
--- a/test/lib/completions/vgdisplay.exp
+++ b/test/lib/completions/vgdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgexport.exp b/test/lib/completions/vgexport.exp
index 2ad4230e..2900960f 100644
--- a/test/lib/completions/vgexport.exp
+++ b/test/lib/completions/vgexport.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgextend.exp b/test/lib/completions/vgextend.exp
index 18a491d2..3c46a8f0 100644
--- a/test/lib/completions/vgextend.exp
+++ b/test/lib/completions/vgextend.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgimport.exp b/test/lib/completions/vgimport.exp
index e4568f3b..ed04e282 100644
--- a/test/lib/completions/vgimport.exp
+++ b/test/lib/completions/vgimport.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgmerge.exp b/test/lib/completions/vgmerge.exp
index 8ba5e893..a4f8833b 100644
--- a/test/lib/completions/vgmerge.exp
+++ b/test/lib/completions/vgmerge.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgmknodes.exp b/test/lib/completions/vgmknodes.exp
index d24552f0..5c9feeb3 100644
--- a/test/lib/completions/vgmknodes.exp
+++ b/test/lib/completions/vgmknodes.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgreduce.exp b/test/lib/completions/vgreduce.exp
index 887ba8de..f6af3150 100644
--- a/test/lib/completions/vgreduce.exp
+++ b/test/lib/completions/vgreduce.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgremove.exp b/test/lib/completions/vgremove.exp
index 26dadf95..0dc5eda8 100644
--- a/test/lib/completions/vgremove.exp
+++ b/test/lib/completions/vgremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgrename.exp b/test/lib/completions/vgrename.exp
index 8ddaa758..81438631 100644
--- a/test/lib/completions/vgrename.exp
+++ b/test/lib/completions/vgrename.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgs.exp b/test/lib/completions/vgs.exp
index a27e3650..22ab176b 100644
--- a/test/lib/completions/vgs.exp
+++ b/test/lib/completions/vgs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgscan.exp b/test/lib/completions/vgscan.exp
index 4bb8c35e..ae8168c8 100644
--- a/test/lib/completions/vgscan.exp
+++ b/test/lib/completions/vgscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgsplit.exp b/test/lib/completions/vgsplit.exp
index 54e7034f..b183cfda 100644
--- a/test/lib/completions/vgsplit.exp
+++ b/test/lib/completions/vgsplit.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vncviewer.exp b/test/lib/completions/vncviewer.exp
index 3d47f49f..8c51e0b2 100644
--- a/test/lib/completions/vncviewer.exp
+++ b/test/lib/completions/vncviewer.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {
         /declare -f _vncviewer_bootstrap/d
     }
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wc.exp b/test/lib/completions/wc.exp
index 8ad2bf8d..b261b6a7 100644
--- a/test/lib/completions/wc.exp
+++ b/test/lib/completions/wc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {wc --help} "" "" "unsupported"]} {
     assert_complete_any "wc --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/webmitm.exp b/test/lib/completions/webmitm.exp
index 1d48a3a6..adb97cc2 100644
--- a/test/lib/completions/webmitm.exp
+++ b/test/lib/completions/webmitm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wget.exp b/test/lib/completions/wget.exp
index 245b27be..8e830a12 100644
--- a/test/lib/completions/wget.exp
+++ b/test/lib/completions/wget.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/who.exp b/test/lib/completions/who.exp
index 73928ef7..6cca6795 100644
--- a/test/lib/completions/who.exp
+++ b/test/lib/completions/who.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {who --help} "" "" "unsupported"]} {
     assert_complete_any "who --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/withlist.exp b/test/lib/completions/withlist.exp
index 6310466d..e1f91f6a 100644
--- a/test/lib/completions/withlist.exp
+++ b/test/lib/completions/withlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wol.exp b/test/lib/completions/wol.exp
index 84a2d88d..a06a2ae9 100644
--- a/test/lib/completions/wol.exp
+++ b/test/lib/completions/wol.exp
@@ -2,13 +2,13 @@ proc setup {} {
     # See fixtures/shared/bin/{arp,ifconfig}
     assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/shared/bin:$PATH";}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
     assert_bash_exec {PATH="$OLDPATH"; unset -v OLDPATH}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wtf.exp b/test/lib/completions/wtf.exp
index 8250becc..b1693c80 100644
--- a/test/lib/completions/wtf.exp
+++ b/test/lib/completions/wtf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wvdial.exp b/test/lib/completions/wvdial.exp
index 8d4669de..5b52daa8 100644
--- a/test/lib/completions/wvdial.exp
+++ b/test/lib/completions/wvdial.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xhost.exp b/test/lib/completions/xhost.exp
index aeceadb6..d4098ade 100644
--- a/test/lib/completions/xhost.exp
+++ b/test/lib/completions/xhost.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {HOME=$TESTDIR}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -17,7 +17,7 @@ set test "Tab should complete hostnames"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts $h
-}; # foreach
+}
 assert_complete $hosts "xhost " $test
 
 
@@ -33,8 +33,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts $h
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost $char" $test
 
 
@@ -46,7 +46,7 @@ set test "Tab should complete hostnames prefixed with +"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts "+$h"
-}; # foreach
+}
 assert_complete $hosts "xhost \+" $test
 
 
@@ -61,8 +61,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts "+$h"
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost +$char"
 
 
@@ -74,7 +74,7 @@ set test "Tab should complete hostnames prefixed with -"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts "-$h"
-}; # foreach
+}
 assert_complete $hosts "xhost -" $test
 
 
@@ -89,8 +89,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts "-$h"
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost -$char" $test
 
 
diff --git a/test/lib/completions/xmllint.exp b/test/lib/completions/xmllint.exp
index 15451471..20daab6d 100644
--- a/test/lib/completions/xmllint.exp
+++ b/test/lib/completions/xmllint.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xmlwf.exp b/test/lib/completions/xmlwf.exp
index a996d458..6c306f34 100644
--- a/test/lib/completions/xmlwf.exp
+++ b/test/lib/completions/xmlwf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xmms.exp b/test/lib/completions/xmms.exp
index c4ad64e8..1f1f6d57 100644
--- a/test/lib/completions/xmms.exp
+++ b/test/lib/completions/xmms.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xpovray.exp b/test/lib/completions/xpovray.exp
index 92cc903d..53a5fcd0 100644
--- a/test/lib/completions/xpovray.exp
+++ b/test/lib/completions/xpovray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xrandr.exp b/test/lib/completions/xrandr.exp
index 649ed43b..14beb762 100644
--- a/test/lib/completions/xrandr.exp
+++ b/test/lib/completions/xrandr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xsltproc.exp b/test/lib/completions/xsltproc.exp
index 2470c22e..2c558ff1 100644
--- a/test/lib/completions/xsltproc.exp
+++ b/test/lib/completions/xsltproc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xvnc4viewer.exp b/test/lib/completions/xvnc4viewer.exp
index 3456c3e7..b10e272c 100644
--- a/test/lib/completions/xvnc4viewer.exp
+++ b/test/lib/completions/xvnc4viewer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
index 820b0689..83b1f350 100644
--- a/test/lib/completions/xz.exp
+++ b/test/lib/completions/xz.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ypcat.exp b/test/lib/completions/ypcat.exp
index f1bd0c0e..a8249dc2 100644
--- a/test/lib/completions/ypcat.exp
+++ b/test/lib/completions/ypcat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ypmatch.exp b/test/lib/completions/ypmatch.exp
index f1695f67..ac264c18 100644
--- a/test/lib/completions/ypmatch.exp
+++ b/test/lib/completions/ypmatch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/yum-arch.exp b/test/lib/completions/yum-arch.exp
index defb7bf4..85c47c22 100644
--- a/test/lib/completions/yum-arch.exp
+++ b/test/lib/completions/yum-arch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/yum.exp b/test/lib/completions/yum.exp
index 09d7282c..899ecddb 100644
--- a/test/lib/completions/yum.exp
+++ b/test/lib/completions/yum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c76d9854..a79ec526 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -22,7 +22,7 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
     if {[string length $aCmd] != 0} {
         send "$aCmd\r"
         expect -ex "$aCmd\r\n"
-    }; # if
+    }
     if {[string length $title] == 0} {set title $aCmd}
     expect -ex $prompt
     set results $expect_out(buffer);  # Catch output
@@ -35,9 +35,9 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
     if {$out == -1 && [string length $results] > 0} {
         if {[info exists multipass_name]} {
             fail "ERROR Unexpected output from bash command \"$title\""
-        }; # if
+        }
         send_user "ERROR Unexpected output from bash command \"$title\":\n$results"
-    }; # if
+    }
 
     set cmd "echo $?"
     send "$cmd\r"
@@ -46,11 +46,11 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
         $prompt {
             if {[info exists multipass_name]} {
                 fail "ERROR executing bash command \"$title\""
-            }; # if
+            }
             send_user "ERROR executing bash command \"$title\""
         }
-    }; # expect
-}; # assert_bash_exec()
+    }
+}
 
 
 # Test `type ...' in bash
@@ -64,10 +64,10 @@ proc assert_bash_type {command} {
     expect {
         -ex 0 { set result true }
         -ex 1 { set result false; unsupported "$test" }
-    }; # expect
+    }
     expect "/@"
     return $result
-}; # assert_bash_type()
+}
 
 
 # Make sure the expected list is returned by executing the specified command.
@@ -103,7 +103,7 @@ proc assert_bash_list_dir {expected cmd dir {test ""} {prompt /@} {size 20}} {
     assert_bash_list $expected $cmd $test $prompt $size
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
-}; # assert_bash_list_dir()
+}
 
 
 # Make sure the expected items are returned by TAB-completing the specified
@@ -140,23 +140,23 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                         # Assume last word of `$cmd' is word to complete on.
                     set index [expr [llength $words] - 1]
                     set cur [lindex $words $index]
-                }; # if
+                }
                     # Remove second word from beginning of single item $expected
                 if {[string first $cur $expected] == 0} {
                     set expected [list [string range $expected [string length $cur] end]]
-                }; # if
-            }; # if
+                }
+            }
         } else {
             expect -ex "$cmd\r\n"
             # Make sure expected items are unique
             set expected [lsort -unique $expected]
-        }; # if
+        }
 
         if {[lsearch -exact $filters "ltrim_colon_completions"] != -1} {
                 # If partial contains colon (:), remove partial from begin of items
                 # See also: bash_completion.__ltrim_colon_completions()
             _ltrim_colon_completions cword expected
-        }; # if
+        }
 
         if {[match_items $expected $test $prompt $size]} {
             if {[llength $expected] == 1} {
@@ -169,7 +169,7 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                     set cmd2 $cmd
                 } else {
                     set cmd2 [_remove_cword_from_cmd $cmd $cword]
-                }; # if
+                }
 
                 # Determine common prefix of completions
                 set common [::textutil::string::longestCommonPrefixList $expected]
@@ -178,13 +178,13 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                     -ex "$prompt$cmd2$common" { pass "$test" }
                     -re $prompt { unresolved "$test at prompt" }
                     -re eof { unresolved "eof" }
-                }; # expect
-            }; # if
+                }
+            }
         } else {
             fail "$test"
-        }; # if
-    }; # if
-}; # assert_complete()
+        }
+    }
+}
 
 
 # @param string $cmd  Command to remove cword from
@@ -203,7 +203,7 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
         # Remove $cword from end of $cmd
         if {[string last $cword $cmd] == [string length $cmd] - [string length $cword]} {
             set cmd2 [string range $cmd 0 [expr [string last $cword $cmd] - 1]]
-        }; # if
+        }
     } else {
         # No, $cword not specified;
         # Check if last argument is really an-argument-to-complete, i.e.
@@ -217,10 +217,10 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
             # Remove argument-to-complete from end of $cmd
             set cmd2 [lrange [split $cmd] 0 end-1]
             append cmd2 " "
-        }; # if
-    }; # if
+        }
+    }
     return $cmd2
-}; # _remove_cword_from_cmd()
+}
 
 
 # Escape regexp special characters
@@ -253,8 +253,8 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
         }
         -re $prompt { unresolved "$test at prompt" }
         eof { unresolved "eof" }
-    }; # expect
-}; # assert_complete_any()
+    }
+}
 
 
 # Make sure the expected files are returned by TAB-completing the
@@ -273,7 +273,7 @@ proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
     assert_complete $expected $cmd $test $prompt $size $cword
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
-}; # assert_complete_dir
+}
     
 
 
@@ -304,11 +304,11 @@ proc assert_complete_partial {expected cmd {partial ""} {test ""} {prompt /@} {s
                 # Only append item if starting with $partial
             if {[string range $item 0 [expr [string length $partial] - 1]] == "$partial"} {
                 lappend pick $item
-            }; # if
-        }; # foreach
+            }
+        }
         assert_complete $pick "$cmd $partial" $test $prompt $size $partial $filters
-    }; # if
-}; # assert_complete_partial()
+    }
+}
 
 
 # See also: bash_completion._ltrim_colon_completions
@@ -329,11 +329,11 @@ proc _ltrim_colon_completions {cword items} {
             if {[string first $cword_out $item] == 0} {
                 # Strip colon-prefix
                 lset items_out $i [string range $item [string length $cword_out] end]
-            }; # if
-        }; # for
+            }
+        }
         #set cword_out ""
-    }; # if
-}; # _ltrim_colon_completions()
+    }
+}
 
 
 # Make sure the bash environment hasn't changed between now and the last call
@@ -370,7 +370,7 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
         append diff "\r\n"
     } else {
         set diff ""
-    }; # if
+    }
 
         # Execute diff
 
@@ -392,11 +392,11 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
             # Remove possible `\r\n[wd]@' from end of diff
             if {[string last "\r\n[wd]@" $diff] == [string length $diff] - [string length "\r\n[wd]@"]} {
                 set diff [string range $diff 0 [expr [string last "\r\n[wd]@" $diff] - 1]]
-            }; # if
+            }
             send_user $diff;
         }
-    }; # expect
-}; # assert_env_unmodified()
+    }
+}
 
 
 # Make sure the specified command executed from within Tcl/Expect.
@@ -426,10 +426,10 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
             unsupported "$test"
         } else {
             $failcmd "$test"
-        }; # if
-    }; # if
+        }
+    }
     return $result
-}; # assert_exec()
+}
 
 
 # Check that no completion is attempted on a certain command.
@@ -439,7 +439,7 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
 proc assert_no_complete {{cmd} {test ""}} {
     if {[string length $test] == 0} {
         set test "$cmd shouldn't complete"
-    }; # if
+    }
 
     send "$cmd\t"
     expect -ex "$cmd"
@@ -451,8 +451,8 @@ proc assert_no_complete {{cmd} {test ""}} {
         -re "^$endguard$" { pass "$test" }
         default { fail "$test" }
         timeout { fail "$test" }
-    }; # expect
-}; # assert_no_complete()
+    }
+}
 
 
 # Check that no output is generated on a certain command.
@@ -510,7 +510,7 @@ proc get_known_hosts {{cword ''}} {
     assert_bash_exec "_known_hosts_real '$cword'; echo_array COMPREPLY" \
         {} /@ result
     return $result
-}; # get_known_hosts()
+}
 
 
 # Get hostnames
@@ -524,9 +524,9 @@ proc get_hosts {} {
     set avahi_hosts [get_hosts_avahi]
     if {[llength $avahi_hosts] > 0} {
         lappend hosts $avahi_hosts
-    }; # if
+    }
     return $hosts
-}; # get_hosts()
+}
 
 
 # Get hostnames according to avahi
@@ -540,9 +540,9 @@ proc get_hosts_avahi {} {
         # No, retrieving hosts yields error;
             # Reset hosts
         set hosts {}
-    }; # if
+    }
     return $hosts
-}; # get_hosts_avahi()
+}
 
 
 # Get signals
@@ -558,10 +558,10 @@ proc get_signals {} {
             set signal [string range $signal 3 end]
                 # Add signal (with dash (-) prefix) to list
             lappend signals -$signal
-        }; # if
-    }; # foreach
+        }
+    }
     return $signals
-}; # get_signals()
+}
 
 
 # Initialize tcl globals with bash variables
@@ -572,7 +572,7 @@ proc init_tcl_bash_globals {} {
     set BASH_VERSINFO [eval list $BASH_VERSINFO]
     assert_bash_exec {printf "%s" "$BASH_VERSION"} "" /@ BASH_VERSION
     assert_bash_exec {printf "%s" "$TESTDIR"} "" /@ TESTDIR
-}; # init_tcl_bash_globals()
+}
 
 
 # Check whether completion is installed for the specified command by executing
@@ -590,13 +590,13 @@ proc is_bash_completion_installed_for {command} {
     }
     expect "/@"
     return $result
-}; # is_bash_completion_installed_for()
+}
 
 
 # Detect if test suite is running under Cygwin/Windows
 proc is_cygwin {} {
     expr {[string first [string tolower [exec uname -s]] cygwin] >= 0}
-}; # is_cygwin()
+}
 
 
 # Expect items.
@@ -615,7 +615,7 @@ proc match_items {items test {prompt /@} {size 20}} {
             _escape_regexp_chars item
             append expected $item
             if {[llength $items] > 1} {append expected {\s+}};
-        }; # for
+        }
         if {[llength $items] == 1} {
             expect {
                 -re "^$expected\r\n$" { set result true }
@@ -625,17 +625,17 @@ proc match_items {items test {prompt /@} {size 20}} {
                 "\r\n" { set result false; break }
                 default { set result false; break }
                 timeout { set result false; break }
-            }; # expect
+            }
         } else {
             expect {
                 -re "^$expected" { set result true }
                 default { set result false; break }
                 timeout { set result false; break }
-            }; # expect
-        }; # if
-    }; # for
+            }
+        }
+    }
     return $result
-}; # match_items()
+}
 
 
 
@@ -651,10 +651,10 @@ proc realcommand {cmd} {
             set result [exec readlink -f $path]
         } else {
             set result $path
-        }; # if
-    }; # if
+        }
+    }
     return $result
-}; # realcommand()
+}
 
 
 # Generate filename to save environment to.
@@ -674,10 +674,10 @@ proc gen_env_filename {{file ""} {seq 1}} {
             # Remove possible '.exp' suffix from filename
         if {[string last ".exp" $file] == [string length $file] - [string length ".exp"]} {
             set file [string range $file 0 [expr [string last ".exp" $file] - 1]]
-        }; # if
-    }; # if
+        }
+    }
     return "\$TESTDIR/tmp/$file.env$seq~"
-}; # gen_env_filename()
+}
 
 
 # Save the environment for later comparison
@@ -685,7 +685,7 @@ proc gen_env_filename {{file ""} {seq 1}} {
 #                      `gen_env_filename()'.
 proc save_env {{file ""}} {
     _save_env [gen_env_filename $file 1]
-}; # save_env()
+}
 
 
 # Save the environment for later comparison
@@ -693,7 +693,7 @@ proc save_env {{file ""}} {
 # @see assert_env_unmodified()
 proc _save_env {{file ""}} {
     assert_bash_exec "{ set; declare -F; shopt -p; } > \"$file\""
-}; # _save_env()
+}
 
 
 # Source bash_completion package
@@ -702,7 +702,7 @@ proc source_bash_completion {} {
     assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
     assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
     assert_bash_exec {source "$BASH_COMPLETION"}
-}; # source_bash_completion()
+}
 
 
 # Split line into words, disregarding backslash escapes (e.g. \b (backspace),
@@ -727,7 +727,7 @@ proc split_words_bash {line} {
             set part [string range $part 0 [expr [string length $part] - [string length "\\"] - 1]]
             # Indicate glue on next run
             set glue_next true
-        }; # if
+        }
         # Must `part' be appended to latest word (= glue)?
         if {[llength $words] > 0 && [string is true $glue]} {
             # Yes, join `part' to latest word;
@@ -738,11 +738,11 @@ proc split_words_bash {line} {
             # No, don't append word to latest word;
             # Append `part' as separate word
             lappend words $part
-        }; # if
+        }
         set glue $glue_next
-    }; # foreach
+    }
     return $words
-}; # split_words_bash()
+}
 
 
 # Given a list of items this proc finds a (part, full) pair so that when
@@ -826,7 +826,7 @@ proc start_bash {} {
     # for bash < 3.2.41.
     # -- FVu, Tue Sep 15 22:52:00 CEST 2009
     assert_bash_exec {is_bash_version_minimal 3 2 41 || set +o history}
-}; # start_bash()
+}
 
 
 # Redirect xtrace output to a file.
@@ -896,7 +896,7 @@ proc sync_after_tab {} {
         #       installed, so that "^$cdm.*$" doesn't match too early - before
         #       comp_install has finished
     sleep .4
-}; # sync_after_tab()
+}
 
 
 # Return current working directory with `TESTDIR' stripped
@@ -905,4 +905,4 @@ proc wd {} {
     global TESTDIR
         # Remove `$TESTDIR' prefix from current working directory
     set wd [string replace [pwd] 0 [expr [string length $TESTDIR] - 1]]/
-}; # wd()
+}
diff --git a/test/unit/__expand_tilde_by_ref.exp b/test/unit/__expand_tilde_by_ref.exp
index d4a75d11..000d3516 100644
--- a/test/unit/__expand_tilde_by_ref.exp
+++ b/test/unit/__expand_tilde_by_ref.exp
@@ -8,14 +8,14 @@ proc setup {home user} {
     set _home [string trim $_home]
     assert_bash_exec {echo "$USER"} {} /@ _user
     set _user [string trim $_user]
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {
         /var=/d
     }
-}; # teardown()
+}
 
 
 setup home user
diff --git a/test/unit/_count_args.exp b/test/unit/_count_args.exp
index da61bdb6..a1419481 100644
--- a/test/unit/_count_args.exp
+++ b/test/unit/_count_args.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
         d
         }
     }
-}; # teardown()
+}
 
 
 setup
diff --git a/test/unit/_get_comp_words_by_ref.exp b/test/unit/_get_comp_words_by_ref.exp
index 22561e7f..c88ad6f6 100644
--- a/test/unit/_get_comp_words_by_ref.exp
+++ b/test/unit/_get_comp_words_by_ref.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -15,7 +15,7 @@ proc teardown {} {
             d
         }
     }
-}; # teardown()
+}
 
 
 setup
@@ -105,7 +105,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_comp_words_by_ref cur prev; echo "$cur $prev"}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -133,7 +133,7 @@ if {
     set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; echo "$cur $prev"};
@@ -148,7 +148,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -161,7 +161,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
     set expected {"c :"}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
 # NOTE: Split-send cmd to prevent backspaces (\008) in output
 assert_bash_exec $cmd $test
@@ -177,7 +177,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
 assert_bash_exec $cmd $test
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -192,7 +192,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
 } else {
     set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b c:'; COMP_POINT=6}
 assert_bash_exec $cmd $test
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -217,7 +217,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
 append cmd {; COMP_LINE='a b::'; COMP_POINT=5}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -256,7 +256,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b=c'; COMP_POINT=5}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; echo "$cur"}
@@ -286,7 +286,7 @@ expect {
     -ex "\$(b c/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -303,7 +303,7 @@ expect {
     -ex "\$(b c\\ d/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -318,7 +318,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
 } else {
     set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; printf %s "$cur"}
@@ -333,7 +333,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/unit/_get_cword.exp b/test/unit/_get_cword.exp
index 1e6e9bfb..c3fbe2ae 100644
--- a/test/unit/_get_cword.exp
+++ b/test/unit/_get_cword.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
         d
         }
     }
-}; # teardown()
+}
 
 
 setup
@@ -105,7 +105,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_cword}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -133,7 +133,7 @@ if {
     set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6; _get_cword};
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -146,7 +146,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -159,7 +159,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword}
 assert_bash_list $expected $cmd $test
 
@@ -172,7 +172,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword :}
 assert_bash_list b:c $cmd $test
 
@@ -185,7 +185,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
 } else {
     set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b c:'; COMP_POINT=6; _get_cword :}
 assert_bash_list c: $cmd $test
 
@@ -206,7 +206,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
 append cmd {; COMP_LINE='a b::'; COMP_POINT=5; _get_cword :}
 assert_bash_list b:: $cmd $test
 
@@ -239,7 +239,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b=c'; COMP_POINT=5; _get_cword}
 assert_bash_list $expected $cmd $test
 
@@ -264,7 +264,7 @@ expect {
     -ex "\$(b c/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -279,7 +279,7 @@ expect {
     -ex "\$(b c\\ d/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -294,7 +294,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
 } else {
     set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6; _get_cword}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -307,7 +307,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 152cf885..31842792 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -8,7 +8,7 @@ proc teardown {} {
         /COMPREPLY=/d
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -35,7 +35,7 @@ set hosts [lsort -ascii $hosts]
 set expected {}
 foreach host $hosts {
     lappend expected "user@$host:"
-}; # foreach
+}
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY}
 assert_bash_list $expected $cmd $test
@@ -66,7 +66,7 @@ expect {
     -re "^$hosts_config\r\n/@$"  { fail "$test (known hosts file)" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -89,7 +89,7 @@ expect -ex "$cmd\r\n"
 expect {
     -re "^$hosts\r\n/@$"  { pass "$test" }
     default { unresolved "$test" }
-}; # expect
+}
     # Teardown environment
 set cmd {HOME=$OLDHOME}
 send "$cmd\r"
diff --git a/test/unit/compgen.exp b/test/unit/compgen.exp
index 6673bf0e..8596cfa5 100644
--- a/test/unit/compgen.exp
+++ b/test/unit/compgen.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD/d}
-}; # teardown()
+}
 
 
 setup
@@ -17,7 +17,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set test {compgen -f a\\\'b/ on bash-4 should return a\'b/c};
     set cmd {compgen -f a\\\'b/}
-}; # if
+}
 set dir fixtures/compgen
 set prompt "/$dir/@"
 assert_bash_exec "cd $dir" "" $prompt
@@ -39,7 +39,7 @@ expect {
     }
     -re $prompt { pass "$test" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 

From a2fcc654e83e1890ba68664072dc5f7bf8f6f46b Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 18 Jun 2010 18:28:54 +0200
Subject: [PATCH 009/214] Refactored _filedir code to _quote_readline_by_ref

See also: http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01944.html
---
 bash_completion | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/bash_completion b/bash_completion
index 7a727f91..1e379766 100644
--- a/bash_completion
+++ b/bash_completion
@@ -568,16 +568,32 @@ __ltrim_colon_completions() {
 #     $ compgen -f "a\\\\\'b/"  # Good (bash-3)
 #     a\'b/c
 #
-# See also: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+# On bash-3, special characters need to be escaped extra.  This is
+# unless the first character is a single quote (').  If the single
+# quote appears further down the string, bash default completion also
+# fails, e.g.:
+#
+#     $ ls 'a&b/'
+#     f
+#     $ foo 'a&b/<TAB>  # Becomes: foo 'a&b/f'
+#     $ foo a'&b/<TAB>  # Nothing happens
+#
+# See also:
+# - http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+# - http://www.mail-archive.com/bash-completion-devel@lists.alioth.\
+#   debian.org/msg01944.html
 # @param $1  Argument to quote
 # @param $2  Name of variable to return result to
 _quote_readline_by_ref()
 {
     if [[ ${1:0:1} == "'" ]]; then
-        # Quote word, leaving out first character
-        printf -v $2 %q "${1:1}"
-        if [[ ${BASH_VERSINFO[0]} -le 3 ]]; then
-            # Double-quote word on bash-3
+        if [[ ${BASH_VERSINFO[0]} -ge 4 ]]; then
+            # Leave out first character
+            printf -v $2 %s "${1:1}"
+        else
+            # Quote word, leaving out first character
+            printf -v $2 %q "${1:1}"
+            # Double-quote word (bash-3)
             printf -v $2 %q ${!2}
         fi
     elif [[ ${BASH_VERSINFO[0]} -le 3 && ${1:0:1} == '"' ]]; then
@@ -621,27 +637,9 @@ _filedir()
         }
     ))
 
-    # On bash-3, special characters need to be escaped extra.  This is
-    # unless the first character is a single quote (').  If the single
-    # quote appears further down the string, bash default completion also
-    # fails, e.g.:
-    #
-    #     $ ls 'a&b/'
-    #     f
-    #     $ foo 'a&b/<TAB>  # Becomes: foo 'a&b/f'
-    #     $ foo a'&b/<TAB>  # Nothing happens
-    #
     if [[ "$1" != -d ]]; then
         xspec=${1:+"!*.$1"}
-        if [[ ${cur:0:1} == "'" && ${BASH_VERSINFO[0]} -ge 4 ]]; then
-            toks=( ${toks[@]-} $(
-                eval compgen -f -X \"\$xspec\" -- $quoted
-            ) )
-        else
-            toks=( ${toks[@]-} $(
-                compgen -f -X "$xspec" -- $quoted
-            ) )
-        fi
+        toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
         if [ ${#toks[@]} -ne 0 ]; then
             # If `compopt' is available, set `-o filenames'
             compopt &>/dev/null && compopt -o filenames ||

From a874f3b35a59e8950c55effc78bee53707ce6d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 20 Jun 2010 15:58:51 +0300
Subject: [PATCH 010/214] Add gif to mplayer filename completions (Alioth:
 #312512).

---
 CHANGES         | 1 +
 contrib/mplayer | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8601d5c5..9b8a3405 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add crontab completion.
+  * Add gif to mplayer filename completions (Alioth: #312512).
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/contrib/mplayer b/contrib/mplayer
index 63af3122..2786b7ad 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF)'
             ;;
     esac
 

From 8346a428fcf76ee7f6c80022fd4154118510e5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 21 Jun 2010 23:32:22 +0300
Subject: [PATCH 011/214] Add "short" tarball extensions to unxz, unlzma etc
 completions.

---
 CHANGES         | 1 +
 bash_completion | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9b8a3405..ac9ced72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ bash-completion (2.x)
   * Activate hping2 completion also for hping and hping3.
   * Add crontab completion.
   * Add gif to mplayer filename completions (Alioth: #312512).
+  * Add "short" tarball extensions to unxz, unlzma etc completions.
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/bash_completion b/bash_completion
index 1e379766..4c184067 100644
--- a/bash_completion
+++ b/bash_completion
@@ -76,8 +76,8 @@ complete -f -X '*.Z' compress znew
 complete -f -X '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
 complete -f -X '!*.Z' uncompress
 # lzcmp, lzdiff intentionally not here, see Debian: #455510
-complete -f -X '!*.lzma' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
-complete -f -X '!*.@(xz|lzma)' unxz xzcat
+complete -f -X '!*.@(tlz|lzma)' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
+complete -f -X '!*.@(?(t)xz|tlz|lzma)' unxz xzcat
 complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' ee
 complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm|GIF|JPG|JP?(E)G|TIF?(F)|PNG|P[BGP]M|BMP|X[BP]M|RLE|RGB|PCX|FITS|PM)' xv qiv
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview

From 48027cfbe1ba73eb1dbc6aa05ae7b5737873d390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 21 Jun 2010 23:48:18 +0300
Subject: [PATCH 012/214] Add lr(un)zip completion.

---
 CHANGES                        |  2 +-
 Makefile.am                    |  1 +
 bash_completion                |  1 +
 contrib/lrzip                  | 63 ++++++++++++++++++++++++++++++++++
 test/completion/lrzip.exp      |  1 +
 test/lib/completions/lrzip.exp | 20 +++++++++++
 6 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 contrib/lrzip
 create mode 100644 test/completion/lrzip.exp
 create mode 100644 test/lib/completions/lrzip.exp

diff --git a/CHANGES b/CHANGES
index ac9ced72..4e9595f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab completion.
+  * Add crontab and lrzip completions.
   * Add gif to mplayer filename completions (Alioth: #312512).
   * Add "short" tarball extensions to unxz, unlzma etc completions.
 
diff --git a/Makefile.am b/Makefile.am
index d34b0283..f83171ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,6 +75,7 @@ bashcomp_DATA = contrib/abook \
 		contrib/links \
 		contrib/lintian \
 		contrib/lisp \
+		contrib/lrzip \
 		contrib/lvm \
 		contrib/lzma \
 		contrib/lzop \
diff --git a/bash_completion b/bash_completion
index 4c184067..2f604045 100644
--- a/bash_completion
+++ b/bash_completion
@@ -78,6 +78,7 @@ complete -f -X '!*.Z' uncompress
 # lzcmp, lzdiff intentionally not here, see Debian: #455510
 complete -f -X '!*.@(tlz|lzma)' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
 complete -f -X '!*.@(?(t)xz|tlz|lzma)' unxz xzcat
+complete -f -X '!*.lrz' lrunzip
 complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' ee
 complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm|GIF|JPG|JP?(E)G|TIF?(F)|PNG|P[BGP]M|BMP|X[BP]M|RLE|RGB|PCX|FITS|PM)' xv qiv
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
diff --git a/contrib/lrzip b/contrib/lrzip
new file mode 100644
index 00000000..e5848035
--- /dev/null
+++ b/contrib/lrzip
@@ -0,0 +1,63 @@
+# lrzip(1) completion
+
+have lrzip &&
+_lrzip()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    if [[ "$cur" == -* && $prev != -N ]]; then
+        COMPREPLY=( $( compgen -W '-w -d -o -O -S -f -D -q -L -n -l -b -g -M \
+            -T -N -v -vv -V -h' -- "$cur" ) )
+        return 0
+    fi
+
+    local xspec="*.lrz"
+
+    case $prev in
+        -w|-S|-V|-h)
+            return 0
+            ;;
+        -d)
+            xspec="!"$xspec
+            ;;
+        -o)
+            _filedir
+            return 0
+            ;;
+        -O)
+            _filedir -d
+            return 0
+            ;;
+        -L)
+            COMPREPLY=( $( compgen -W '1 2 3 4 5 6 7 8 9' -- "$cur" ) )
+            return 0
+            ;;
+        -T)
+            COMPREPLY=( $( compgen -W '1 2 3 4 5 6 7 8 9 10' -- "$cur" ) )
+            return 0
+            ;;
+        -N)
+            COMPREPLY=( $( compgen -W '-20 -19 -18 -17 -16 -15 -14 -13 -12 \
+                -11 -10 -9 -8 -7 -6 -5 -4 -3 -2 -1 0 1 2 3 4 5 6 7 8 9 10 11 \
+                12 13 14 15 16 17 18 19' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    _expand || return 0
+
+    local IFS=$'\t\n'
+    COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
+        $( compgen -d -- "$cur" ) )
+} &&
+complete -F _lrzip -o filenames lrzip
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/lrzip.exp b/test/completion/lrzip.exp
new file mode 100644
index 00000000..60616f00
--- /dev/null
+++ b/test/completion/lrzip.exp
@@ -0,0 +1 @@
+assert_source_completions lrzip
diff --git a/test/lib/completions/lrzip.exp b/test/lib/completions/lrzip.exp
new file mode 100644
index 00000000..bcf26c12
--- /dev/null
+++ b/test/lib/completions/lrzip.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "lrzip "
+
+
+sync_after_int
+
+
+teardown

From 2e95443e1489ec75b7abb25bb43f5b8a931347ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 22 Jun 2010 00:07:21 +0300
Subject: [PATCH 013/214] (testsuite) Drop ending block comments.

---
 test/generate                  | 4 ++--
 test/lib/completions/lrzip.exp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/generate b/test/generate
index aa282a2c..dc400cb6 100755
--- a/test/generate
+++ b/test/generate
@@ -32,12 +32,12 @@ generate_test_lib_completions() {
     cat <<EXPECT > "$path"
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lrzip.exp b/test/lib/completions/lrzip.exp
index bcf26c12..97bc1235 100644
--- a/test/lib/completions/lrzip.exp
+++ b/test/lib/completions/lrzip.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup

From 603c25903d68c5bb206412af0b43a588ec7c3e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 28 Jun 2010 19:54:16 +0300
Subject: [PATCH 014/214] Simplify/improve /etc/init.d/* completions.

Avoid subshell, do the right thing for filenames with spaces, do not
install completions for non-executable files.
---
 CHANGES         | 1 +
 contrib/service | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4e9595f2..ab436c2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ bash-completion (2.x)
   * Add crontab and lrzip completions.
   * Add gif to mplayer filename completions (Alioth: #312512).
   * Add "short" tarball extensions to unxz, unlzma etc completions.
+  * Improve /etc/init.d/* completions.
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/contrib/service b/contrib/service
index f27222a1..6efd7c1a 100644
--- a/contrib/service
+++ b/contrib/service
@@ -32,10 +32,11 @@ _service()
     return 0
 } &&
 complete -F _service service
-[ -d /etc/init.d/ ] && (
-    services=$(for i in /etc/init.d/*; do
-        complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
-    [ -n "$services" ] && complete -F _service -o default $services;)
+for svc in /etc/init.d/*; do
+    [ ! -x "$svc" ] || complete -p "${svc##*/}" &>/dev/null || \
+        complete -F _service -o default "${svc##*/}"
+done
+unset svc
 
 # Local variables:
 # mode: shell-script

From 6571c6685c0bbfa6aac999fdc18299594293d83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 29 Jun 2010 19:23:26 +0300
Subject: [PATCH 015/214] Add sqlite3 option completions, include *.db in
 filename ones (Alioth: 312605).

---
 CHANGES                          |  2 +-
 Makefile.am                      |  1 +
 bash_completion                  |  1 -
 contrib/sqlite3                  | 39 ++++++++++++++++++++++++++++++++
 test/completion/sqlite3.exp      |  1 +
 test/lib/completions/sqlite3.exp | 20 ++++++++++++++++
 6 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 contrib/sqlite3
 create mode 100644 test/completion/sqlite3.exp
 create mode 100644 test/lib/completions/sqlite3.exp

diff --git a/CHANGES b/CHANGES
index ab436c2a..05ac17aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@ bash-completion (2.x)
   * Add crontab and lrzip completions.
   * Add gif to mplayer filename completions (Alioth: #312512).
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/* completions.
+  * Improve /etc/init.d/* and sqlite3 completions.
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/Makefile.am b/Makefile.am
index f83171ee..331d234c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,6 +139,7 @@ bashcomp_DATA = contrib/abook \
 		contrib/sitecopy \
 		contrib/smartctl \
 		contrib/snownews \
+		contrib/sqlite3 \
 		contrib/ssh \
 		contrib/sshfs \
 		contrib/strace \
diff --git a/bash_completion b/bash_completion
index 2f604045..53eea33f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -115,7 +115,6 @@ complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw
 complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
 complete -f -X '!*.odb' oobase
 complete -f -X '!*.rpm' rpm2cpio
-complete -f -X '!*.s@(qlite?(3)|?(3)db)' sqlite3
 complete -f -X '!*.aux' bibtex
 complete -f -X '!*.po' poedit gtranslator kbabel lokalize
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
diff --git a/contrib/sqlite3 b/contrib/sqlite3
new file mode 100644
index 00000000..f02b2e09
--- /dev/null
+++ b/contrib/sqlite3
@@ -0,0 +1,39 @@
+# sqlite3(1) completion
+
+have sqlite3 &&
+_sqlite3()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    local dbexts='@(sqlite?(3)|?(s?(3))db)'
+
+    case $prev in
+        -help|-version|-separator|-nullvalue|*.$dbexts)
+            return 0
+            ;;
+        -init)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-help -init -echo -header -noheader -bail
+            -interactive -batch -column -csv -html -line -list -separator
+            -nullvalue -version' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir $dbexts
+} &&
+complete -F _sqlite3 -o filenames sqlite3
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/sqlite3.exp b/test/completion/sqlite3.exp
new file mode 100644
index 00000000..88195e0d
--- /dev/null
+++ b/test/completion/sqlite3.exp
@@ -0,0 +1 @@
+assert_source_completions sqlite3
diff --git a/test/lib/completions/sqlite3.exp b/test/lib/completions/sqlite3.exp
new file mode 100644
index 00000000..af1ada82
--- /dev/null
+++ b/test/lib/completions/sqlite3.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "sqlite3 "
+
+
+sync_after_int
+
+
+teardown

From ccbf141e13eaa98d6a8721ae015a5504654424cb Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 30 Jun 2010 23:28:31 +0200
Subject: [PATCH 016/214] Fix tilde (~) completion with _filedir This fixes
 tilde completion when doing for instance `ls ~<TAB>'.  See also: Alioth
 #312613.

Added _tilde() helper function.

Contrary to _expand() and __expand_tilde_by_ref(), _tilde() also leaves the
tilde (~) intact.  Replacement of the tilde has been a complaint in other
bugreports, especially since plain bash completion (without bash-completion
installed) doesn't expand the tilde when doing a `ls ~<TAB>'.

To run the tests:

    ./run completion/ls.exp
    ./run unit/_tilde.exp
---
 CHANGES                     |  3 +++
 bash_completion             | 23 +++++++++++++++--
 test/lib/completions/ls.exp | 10 ++++++++
 test/unit/_tilde.exp        | 51 +++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/_tilde.exp

diff --git a/CHANGES b/CHANGES
index 05ac17aa..1c311bc1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ bash-completion (2.x)
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/* and sqlite3 completions.
 
+  [ Freddy Vulto ]
+  * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/bash_completion b/bash_completion
index 53eea33f..e1e926b9 100644
--- a/bash_completion
+++ b/bash_completion
@@ -618,7 +618,7 @@ _filedir()
 {
     local i IFS=$'\t\n' xspec
 
-    __expand_tilde_by_ref cur
+    _tilde "$cur" || return 0
 
     local -a toks
     local quoted tmp
@@ -803,7 +803,26 @@ _available_interfaces()
 }
 
 
+# Perform tilde (~) completion
+# @return  True (0) if completion needs further processing, 
+#          False (> 0) if tilde is followed by a valid username, completions
+#          are put in COMPREPLY and no further processing is necessary.
+_tilde() {
+    local result=0
+    # Does $1 start with tilde (~) and doesn't contain slash (/)?
+    if [[ ${1:0:1} == "~" && $1 == ${1//\/} ]]; then
+        # Try generate username completions
+        COMPREPLY=( $( compgen -P '~' -u "${1#\~}" ) )
+        result=${#COMPREPLY[@]}
+    fi
+    return $result
+}
+
+
 # Expand variable starting with tilde (~)
+# We want to expand ~foo/... to /home/foo/... to avoid problems when
+# word-to-complete starting with a tilde is fed to commands and ending up
+# quoted instead of expanded.
 # Only the first portion of the variable from the tilde up to the first slash
 # (~../) is expanded.  The remainder of the variable, containing for example
 # a dollar sign variable ($) or asterisk (*) is not expanded.
@@ -832,7 +851,7 @@ __expand_tilde_by_ref() {
             #    becomes "~a".  Double quotes allow eval.
             # 2: Remove * before the first slash (/), i.e. "~a/b"
             #    becomes "b".  Single quotes prevent eval.
-            #                          +-----1----+ +---2----+
+            #       +-----1----+ +---2----+
             eval $1="${!1/%\/*}"/'${!1#*/}'
         else 
             # No, $1 doesn't contain slash
diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index 171f6e14..fa47f85b 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -19,4 +19,14 @@ if {[assert_exec {ls --help} "" "" "unsupported"]} {
 sync_after_int
 
 
+set test "~part should complete to ~full"
+assert_bash_exec {compgen -u} {} /@ users
+find_unique_completion_pair $users part full
+set cmd [format {ls ~%s} $part]
+assert_complete "~$full/" $cmd $test
+
+
+sync_after_int
+
+
 teardown
diff --git a/test/unit/_tilde.exp b/test/unit/_tilde.exp
new file mode 100644
index 00000000..54394cb8
--- /dev/null
+++ b/test/unit/_tilde.exp
@@ -0,0 +1,51 @@
+# @param string $part  Reference to variable to hold partial unique username
+# @param string $full  Reference to variable to hold full unique username
+proc setup {part full} {
+    upvar $part _part
+    upvar $full _full
+
+    assert_bash_exec {compgen -u} {} /@ users
+    find_unique_completion_pair $users _part _full
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified {
+        /COMPREPLY=/d
+    }
+}
+
+
+setup part full
+
+
+set test "function should run without errors"
+assert_bash_exec {_tilde > /dev/null} $test
+
+
+sync_after_int
+
+
+set test "function should not pollute environment"
+# NOTE: A possible environment pollution is detected by assert_env_modified() in teardown()
+assert_bash_exec {foo() { local aa="~"; _tilde "$aa"; }; foo; unset foo} $test
+
+
+sync_after_int
+
+
+set test "~full should complete to ~full unmodified"
+set cmd [format {_tilde "~%s"; printf "%%s" "${COMPREPLY[@]}"} $full]
+assert_bash_list "~$full" $cmd $test
+
+
+sync_after_int
+
+
+set test "~part should complete to ~full"
+set cmd [format {_tilde "~%s"; printf "%%s" "${COMPREPLY[@]}"} $part]
+assert_bash_list "~$full" $cmd $test
+
+
+teardown

From 66d3b639159492dcee0845a915724bdf90c96d45 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 30 Jun 2010 23:40:13 +0200
Subject: [PATCH 017/214] Speed up `compopt' availability detection. Used `type
 compopt' instead of `compopt' to detect availability of compopt because (at
 least on Ubuntu) a python-command-not-found handler is started when issuing a
 non-existing command, thus resulting in considerable slower completions on
 systems without compopt (bash < 4.0).

---
 CHANGES         | 1 +
 bash_completion | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1c311bc1..e1ba72b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ bash-completion (2.x)
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
+  * Speed up `compopt' availability detection
 
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
diff --git a/bash_completion b/bash_completion
index e1e926b9..732cb9ad 100644
--- a/bash_completion
+++ b/bash_completion
@@ -642,7 +642,7 @@ _filedir()
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
         if [ ${#toks[@]} -ne 0 ]; then
             # If `compopt' is available, set `-o filenames'
-            compopt &>/dev/null && compopt -o filenames ||
+            type compopt &>/dev/null && compopt -o filenames ||
             # No, `compopt' isn't available;
             # Is `-o filenames' set?
             [[ (

From ff7c17e599399b763b6271768d9d23497c72bd74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 1 Jul 2010 20:21:35 +0300
Subject: [PATCH 018/214] Trivial cleanups.

---
 bash_completion | 4 ++--
 contrib/cvs     | 2 +-
 contrib/mutt    | 2 +-
 contrib/service | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bash_completion b/bash_completion
index 732cb9ad..ef00f05a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -310,7 +310,7 @@ __reassemble_comp_words_by_ref() {
             ref="$2[$j]"
             eval $2[$j]=\${!ref}\${COMP_WORDS[i]}
             # Indicate new cword
-            [ $i = $COMP_CWORD ] && [[ ${COMP_WORDS[i]} ]] && eval $3=$j
+            [[ $i == $COMP_CWORD && ${COMP_WORDS[i]} ]] && eval $3=$j
         done
     else
         # No, list of word completions separators hasn't changed;
@@ -464,7 +464,7 @@ _get_cword()
     # return previous word offset by $2
     if [[ ${2//[^0-9]/} ]]; then
         printf "%s" "${words[cword-$2]}"
-    elif [[ "${#words[cword]}" -eq 0 ]] || [[ "$COMP_POINT" == "${#COMP_LINE}" ]]; then
+    elif [[ "${#words[cword]}" -eq 0 || "$COMP_POINT" == "${#COMP_LINE}" ]]; then
         printf "%s" "${words[cword]}"
     else
         local i
diff --git a/contrib/cvs b/contrib/cvs
index 04837cd1..be3b1be7 100644
--- a/contrib/cvs
+++ b/contrib/cvs
@@ -238,7 +238,7 @@ _cvs()
 
             set_prefix
 
-            if [[ "$cur" != -* ]] && [ -r ${prefix:-}CVS/Entries ]; then
+            if [[ "$cur" != -* && -r ${prefix:-}CVS/Entries ]]; then
                 # if $COMP_CVS_REMOTE is not null, 'cvs commit' will
                 # complete on remotely checked-out files (requires
                 # passwordless access to the remote repository
diff --git a/contrib/mutt b/contrib/mutt
index fc12e690..f86e6759 100644
--- a/contrib/mutt
+++ b/contrib/mutt
@@ -58,7 +58,7 @@ _muttconffiles()
     while [[ "$1" ]]; do
         newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval echo $1) ) )
         for file in "${newconffiles[@]}"; do
-            [[ ! "$file" ]] || [[ "${sofar/ ${file} / }" != "$sofar" ]] &&
+            [[ ! "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
                 continue
             sofar="$sofar $file"
             sofar=" $(eval _muttconffiles \"$sofar\" $file) "
diff --git a/contrib/service b/contrib/service
index 6efd7c1a..ffd24366 100644
--- a/contrib/service
+++ b/contrib/service
@@ -21,7 +21,7 @@ _service()
 
     [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
 
-    if [[ $COMP_CWORD -eq 1 ]] && [[ $prev == "service" ]]; then
+    if [[ $COMP_CWORD -eq 1 && $prev == "service" ]]; then
         _services
     else
         COMPREPLY=( $( compgen -W '`sed -e "y/|/ /" \

From 7b67991c1818a8e2fe89990cf71fa33df8e1b731 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 2 Jul 2010 07:06:32 +0200
Subject: [PATCH 019/214] (testsuite) Fix ls test Append slash (/) or space ("
 ") to completion depending on whether `~user' home directory exists or not.

---
 test/lib/completions/ls.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index fa47f85b..a7537dc7 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -22,8 +22,9 @@ sync_after_int
 set test "~part should complete to ~full"
 assert_bash_exec {compgen -u} {} /@ users
 find_unique_completion_pair $users part full
-set cmd [format {ls ~%s} $part]
-assert_complete "~$full/" $cmd $test
+# If home directory exists, append slash "/", else space " "
+set trail [expr {[llength [glob -nocomplain ~$full]] ? "/" : " "}]
+assert_complete "~$full$trail" "ls ~$part" $test
 
 
 sync_after_int

From b0c9212c544e53861a90e9c4f9c015965eba37b2 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Wed, 7 Jul 2010 18:44:32 +0200
Subject: [PATCH 020/214] mplayer: run mplayer with -nomsgmodule -nomsgcolor

this fixes completion if user has msgmodule and/or msgcolor enabled in
the config file.
---
 contrib/mplayer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mplayer b/contrib/mplayer
index 2786b7ad..0c15cd11 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -4,7 +4,7 @@ have mplayer && {
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $( compgen -W "$( $1 $2 help 2>/dev/null | \
+    COMPREPLY=( $( compgen -W "$( $1 -nomsgcolor -nomsgmodule $2 help 2>/dev/null | \
         sed -e '1,/^Available/d' | awk '{print $1}' | \
         sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//' )" -- "$cur" ) )
 }
@@ -230,7 +230,7 @@ _mplayer()
 
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '$( $cmd -list-options 2>/dev/null | \
+            COMPREPLY=( $( compgen -W '$( $cmd -nomsgcolor -nomsgmodule -list-options 2>/dev/null | \
                 sed -ne '1,/^[[:space:]]*Name/d' \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )

From d1f5b983af7a08246780106d1463b6e5f685ef9e Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Wed, 7 Jul 2010 18:44:33 +0200
Subject: [PATCH 021/214] mplayer: complete on .nut and .bik files.

---
 contrib/mplayer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mplayer b/contrib/mplayer
index 0c15cd11..1f8a4acf 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK)'
             ;;
     esac
 

From 78107506c61d6224f4b4f1a27f078b5d1ade22a8 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Wed, 7 Jul 2010 18:44:34 +0200
Subject: [PATCH 022/214] mplayer: fix profile names completion.

unlike other '-foo help' style options for which the first line is
mplayer copyright info followed by ^Available line, -profile help
outputs first the list of profile names and copyirght info is actually
the last line.
---
 contrib/mplayer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mplayer b/contrib/mplayer
index 1f8a4acf..e74db5e4 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -5,7 +5,7 @@ _mplayer_options_list()
 {
     cur=${cur%\\}
     COMPREPLY=( $( compgen -W "$( $1 -nomsgcolor -nomsgmodule $2 help 2>/dev/null | \
-        sed -e '1,/^Available/d' | awk '{print $1}' | \
+        sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
         sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//' )" -- "$cur" ) )
 }
 

From b925bff04c008a2b0469c53b3b206059239f7c18 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Wed, 7 Jul 2010 18:44:35 +0200
Subject: [PATCH 023/214] mplayer: update lavdopts suboptions

also sort them in alphabetical order
---
 contrib/mplayer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mplayer b/contrib/mplayer
index e74db5e4..5f5dd648 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -115,7 +115,7 @@ _mplayer()
             return 0
             ;;
         -lavdopts)
-            COMPREPLY=( $( compgen -W 'ec er= bug= idct= gray' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W 'bitexact bug= debug= ec= er= fast gray idct= lowres= sb= st= skiploopfilter= skipidct= skipframe= threads= vismv= vstats' -- "$cur" ) )
             return 0
             ;;
         -lavcopts)

From bb8ba402357cb029235c12a5253b7d33e5872001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 11 Jul 2010 12:16:52 +0300
Subject: [PATCH 024/214] Note Anton's mplayer completion improvements.

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index e1ba72b8..5c463ee6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,9 @@ bash-completion (2.x)
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
   * Speed up `compopt' availability detection
 
+  [ Anton Khirnov ]
+  * Improve mplayer and mencoder completions.
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)

From 5eead0ebeecf7d3212df3fea9cfe0fa88b6d0274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 11 Jul 2010 14:51:06 +0300
Subject: [PATCH 025/214] Fix p4 completion, was broken in
 f8bafe285e7d20fdd82f77289059dd18f78312c2 (Alioth: #312625).

---
 CHANGES    |  1 +
 contrib/p4 | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5c463ee6..c65de5a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ bash-completion (2.x)
   * Add gif to mplayer filename completions (Alioth: #312512).
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/* and sqlite3 completions.
+  * Fix p4 completion (Alioth: #312625).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/contrib/p4 b/contrib/p4
index 0795a28e..59b02c1d 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -3,10 +3,10 @@
 have p4 &&
 _p4()
 {
-    local cur prev preprev p4commands p4filetypes
+    local cur prev words cword p4commands p4filetypes
 
     COMPREPLY=()
-    _get_comp_words_by_ref cur prev preprev
+    _get_comp_words_by_ref cur prev words cword
 
     # rename isn't really a command
     p4commands="$( p4 help commands | awk 'NF>3 {print $1}' )"
@@ -14,9 +14,9 @@ _p4()
         uresource uxbinary xbinary xltext xtempobj xtext \
         text binary resource"
 
-    if [ $COMP_CWORD -eq 1 ]; then
+    if [ $cword -eq 1 ]; then
         COMPREPLY=( $( compgen -W "$p4commands" -- "$cur" ) )
-    elif [ $COMP_CWORD -eq 2 ]; then
+    elif [ $cword -eq 2 ]; then
         case $prev in
             help)
                 COMPREPLY=( $( compgen -W "simple commands \
@@ -29,10 +29,10 @@ _p4()
             *)
                 ;;
         esac
-    elif [ $COMP_CWORD -gt 2 ]; then
+    elif [ $cword -gt 2 ]; then
         case $prev in
             -t)
-                case $preprev in
+                case ${words[$cword-2]} in
                     add|edit|reopen)
                         COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
                         ;;

From fc3c16e95302d1bcc9f2a543fcb48d5b815603af Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@booyaka.com>
Date: Tue, 13 Jul 2010 21:05:26 +0300
Subject: [PATCH 026/214] Add *.webm to mplayer file completions (Debian:
 #588079).

---
 CHANGES         | 3 +++
 contrib/mplayer | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c65de5a3..b79a4cf0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,9 @@ bash-completion (2.x)
   [ Anton Khirnov ]
   * Improve mplayer and mencoder completions.
 
+  [ Paul Walmsley ]
+  * Add *.webm to mplayer file completions (Debian: #588079).
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/contrib/mplayer b/contrib/mplayer
index 5f5dd648..2f76c666 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM)'
             ;;
     esac
 

From 51b4f5b5c4a1016d8389a29f2461fa9ae4f6e146 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 27 Jul 2010 20:11:31 +0200
Subject: [PATCH 027/214] Add *.amr to mplayer file completions (Alioth:
 #312634).

---
 CHANGES         | 3 +++
 contrib/mplayer | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b79a4cf0..1879c0cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,9 @@ bash-completion (2.x)
   [ Paul Walmsley ]
   * Add *.webm to mplayer file completions (Debian: #588079).
 
+  [ Miklos Vajna ]
+  * Add *.amr to mplayer file completions (Alioth: #312634).
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/contrib/mplayer b/contrib/mplayer
index 2f76c666..b4b1b3cf 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR)'
             ;;
     esac
 

From bdf063edd132fc74a77d022e9bc2a8a2d446d396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 27 Jul 2010 23:40:19 +0300
Subject: [PATCH 028/214] Add *.awb to mplayer filename completions.

---
 CHANGES         | 2 +-
 contrib/mplayer | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1879c0cc..81a97207 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add crontab and lrzip completions.
-  * Add gif to mplayer filename completions (Alioth: #312512).
+  * Add *.gif (Alioth: #312512) and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/* and sqlite3 completions.
   * Fix p4 completion (Alioth: #312625).
diff --git a/contrib/mplayer b/contrib/mplayer
index b4b1b3cf..6d1e977d 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)'
             ;;
     esac
 

From 6d556ee5b782acc623d10c6dd22aa3b7f3b3e6e6 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Mon, 2 Aug 2010 22:07:24 +0200
Subject: [PATCH 029/214] split installation logic for completions in a
 separate Makefile.am, for easier management of generated files

---
 Makefile.am         | 174 +-------------------------------------------
 configure.ac        |   3 +-
 contrib/Makefile.am | 172 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+), 173 deletions(-)
 create mode 100644 contrib/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 331d234c..ffc84429 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,175 +1,7 @@
-SUBDIRS = test
+SUBDIRS = contrib test
 
 sysconf_DATA = bash_completion
 
-bashcompdir = $(sysconfdir)/bash_completion.d
-bashcomp_DATA = contrib/abook \
-		contrib/ant \
-		contrib/apache2ctl \
-		contrib/apt \
-		contrib/apt-build \
-		contrib/aptitude \
-		contrib/aspell \
-		contrib/autorpm \
-		contrib/bash-builtins \
-		contrib/bind-utils \
-		contrib/bitkeeper \
-		contrib/bittorrent \
-		contrib/bluez \
-		contrib/brctl \
-		contrib/bzip2 \
-		contrib/cardctl \
-		contrib/cfengine \
-		contrib/chkconfig \
-		contrib/chsh \
-		contrib/cksfv \
-		contrib/clisp \
-		contrib/configure \
-		contrib/coreutils \
-		contrib/cowsay \
-		contrib/cpan2dist \
-		contrib/cpio \
-		contrib/crontab \
-		contrib/cups \
-		contrib/cryptsetup \
-		contrib/cvs \
-		contrib/cvsps \
-		contrib/dd \
-		contrib/dhclient \
-		contrib/dict \
-		contrib/dpkg \
-		contrib/dselect \
-		contrib/dsniff \
-		contrib/findutils \
-		contrib/freeciv \
-		contrib/fuse \
-		contrib/gcc \
-		contrib/gcl \
-		contrib/gdb \
-		contrib/genisoimage \
-		contrib/getent \
-		contrib/gkrellm \
-		contrib/gnatmake \
-		contrib/gpg \
-		contrib/gpg2 \
-		contrib/gzip \
-		contrib/heimdal \
-		contrib/hping2 \
-		contrib/iconv \
-		contrib/ifupdown \
-		contrib/imagemagick \
-		contrib/info \
-		contrib/iptables \
-		contrib/ipmitool \
-		contrib/ipsec \
-		contrib/ipv6calc \
-		contrib/isql \
-		contrib/jar \
-		contrib/java \
-		contrib/k3b \
-		contrib/kldload \
-		contrib/larch \
-		contrib/ldapvi \
-		contrib/lftp \
-		contrib/lilo \
-		contrib/links \
-		contrib/lintian \
-		contrib/lisp \
-		contrib/lrzip \
-		contrib/lvm \
-		contrib/lzma \
-		contrib/lzop \
-		contrib/mailman \
-		contrib/make \
-		contrib/man \
-		contrib/mc \
-		contrib/mcrypt \
-		contrib/mdadm \
-		contrib/medusa \
-		contrib/minicom \
-		contrib/mkinitrd \
-		contrib/module-init-tools \
-		contrib/monodevelop \
-		contrib/mount \
-		contrib/mplayer \
-		contrib/msynctool \
-		contrib/mtx \
-		contrib/munin-node \
-		contrib/mutt \
-		contrib/mysqladmin \
-		contrib/ncftp \
-		contrib/net-tools \
-		contrib/nmap \
-		contrib/ntpdate \
-		contrib/openldap \
-		contrib/openssl \
-		contrib/p4 \
-		contrib/perl \
-		contrib/pine \
-		contrib/pkg-config \
-		contrib/pkg_install \
-		contrib/pkgtools \
-		contrib/pm-utils \
-		contrib/portupgrade \
-		contrib/postfix \
-		contrib/postgresql \
-		contrib/povray \
-		contrib/procps \
-		contrib/python \
-		contrib/qdbus \
-		contrib/qemu \
-		contrib/quota-tools \
-		contrib/rcs \
-		contrib/rdesktop \
-		contrib/reportbug \
-		contrib/resolvconf \
-		contrib/rfkill \
-		contrib/ri \
-		contrib/rpcdebug \
-		contrib/rpm \
-		contrib/rpmcheck \
-		contrib/rrdtool \
-		contrib/rsync \
-		contrib/rtcwake \
-		contrib/samba \
-		contrib/sbcl \
-		contrib/screen \
-		contrib/service \
-		contrib/shadow \
-		contrib/sitecopy \
-		contrib/smartctl \
-		contrib/snownews \
-		contrib/sqlite3 \
-		contrib/ssh \
-		contrib/sshfs \
-		contrib/strace \
-		contrib/svk \
-		contrib/sysctl \
-		contrib/sysv-rc \
-		contrib/tar \
-		contrib/tcpdump \
-		contrib/unace \
-		contrib/unrar \
-		contrib/update-alternatives \
-		contrib/util-linux \
-		contrib/vncviewer \
-		contrib/vpnc \
-		contrib/wireless-tools \
-		contrib/wodim \
-		contrib/wol \
-		contrib/wtf \
-		contrib/wvdial \
-		contrib/xhost \
-		contrib/xm \
-		contrib/xmllint \
-		contrib/xmlwf \
-		contrib/xmms \
-		contrib/xrandr \
-		contrib/xsltproc \
-		contrib/xz \
-		contrib/yp-tools \
-		contrib/yum-arch
-
 profiledir = $(sysconfdir)/profile.d
 profile_DATA = bash_completion.sh
 
@@ -178,6 +10,4 @@ bash_completion.sh: bash_completion.sh.in Makefile
 
 CLEANFILES = bash_completion.sh
 
-EXTRA_DIST = CHANGES $(sysconf_DATA) $(bashcomp_DATA) bash_completion.sh.in \
-	contrib/_mock contrib/_modules contrib/_subversion contrib/_yum \
-	contrib/_yum-utils
+EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in
diff --git a/configure.ac b/configure.ac
index 63f0898a..1aba9e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
-AC_CONFIG_FILES([Makefile test/Makefile])
+AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
+AC_CONFIG_FILES([Makefile contrib/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 00000000..6c5a5869
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,172 @@
+bashcomp_DATA = abook \
+		ant \
+		apache2ctl \
+		apt \
+		apt-build \
+		aptitude \
+		aspell \
+		autorpm \
+		bash-builtins \
+		bind-utils \
+		bitkeeper \
+		bittorrent \
+		bluez \
+		brctl \
+		bzip2 \
+		cardctl \
+		cfengine \
+		chkconfig \
+		chsh \
+		cksfv \
+		clisp \
+		configure \
+		coreutils \
+		cowsay \
+		cpan2dist \
+		cpio \
+		crontab \
+		cups \
+		cryptsetup \
+		cvs \
+		cvsps \
+		dd \
+		dhclient \
+		dict \
+		dpkg \
+		dselect \
+		dsniff \
+		findutils \
+		freeciv \
+		fuse \
+		gcc \
+		gcl \
+		gdb \
+		genisoimage \
+		getent \
+		gkrellm \
+		gnatmake \
+		gpg \
+		gpg2 \
+		gzip \
+		heimdal \
+		hping2 \
+		iconv \
+		ifupdown \
+		imagemagick \
+		info \
+		iptables \
+		ipmitool \
+		ipsec \
+		ipv6calc \
+		isql \
+		jar \
+		java \
+		k3b \
+		kldload \
+		larch \
+		ldapvi \
+		lftp \
+		lilo \
+		links \
+		lintian \
+		lisp \
+		lrzip \
+		lvm \
+		lzma \
+		lzop \
+		mailman \
+		make \
+		man \
+		mc \
+		mcrypt \
+		mdadm \
+		medusa \
+		minicom \
+		mkinitrd \
+		module-init-tools \
+		monodevelop \
+		mount \
+		mplayer \
+		msynctool \
+		mtx \
+		munin-node \
+		mutt \
+		mysqladmin \
+		ncftp \
+		net-tools \
+		nmap \
+		ntpdate \
+		openldap \
+		openssl \
+		p4 \
+		perl \
+		pine \
+		pkg-config \
+		pkg_install \
+		pkgtools \
+		pm-utils \
+		portupgrade \
+		postfix \
+		postgresql \
+		povray \
+		procps \
+		python \
+		qdbus \
+		qemu \
+		quota-tools \
+		rcs \
+		rdesktop \
+		reportbug \
+		resolvconf \
+		rfkill \
+		ri \
+		rpcdebug \
+		rpm \
+		rpmcheck \
+		rrdtool \
+		rsync \
+		rtcwake \
+		samba \
+		sbcl \
+		screen \
+		service \
+		shadow \
+		sitecopy \
+		smartctl \
+		snownews \
+		sqlite3 \
+		ssh \
+		sshfs \
+		strace \
+		svk \
+		sysctl \
+		sysv-rc \
+		tar \
+		tcpdump \
+		unace \
+		unrar \
+		update-alternatives \
+		util-linux \
+		vncviewer \
+		vpnc \
+		wireless-tools \
+		wodim \
+		wol \
+		wtf \
+		wvdial \
+		xhost \
+		xm \
+		xmllint \
+		xmlwf \
+		xmms \
+		xrandr \
+		xsltproc \
+		xz \
+		yp-tools \
+		yum-arch
+
+EXTRA_DIST = $(bashcomp_DATA) \
+	     _mock _modules _subversion _yum _yum-utils
+
+CLEANFILES = perl
+

From 07b7ddd1dd9311a4bd8ca9bac415c8e6ab84518d Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Mon, 2 Aug 2010 22:15:35 +0200
Subject: [PATCH 030/214] add pure perl perldoc completion helper

---
 CHANGES             |   3 ++
 configure.ac        |   3 +-
 contrib/perl        | 127 --------------------------------------------
 contrib/perl.in     |  61 +++++++++++++++++++++
 helpers/Makefile.am |   3 ++
 helpers/perldoc     | 102 +++++++++++++++++++++++++++++++++++
 6 files changed, 171 insertions(+), 128 deletions(-)
 delete mode 100644 contrib/perl
 create mode 100644 contrib/perl.in
 create mode 100644 helpers/Makefile.am
 create mode 100755 helpers/perldoc

diff --git a/CHANGES b/CHANGES
index 81a97207..d0e70c68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 bash-completion (2.x)
+  [ Guillaume Rousse ]
+  * added pure-perl perldoc completion helper, using work from Aristotle 
+    Pagaltzis (pagaltzis@gmx.de)
 
   [ David Paleino ]
   * Fixed "service" completion, thanks to John Hedges (Debian: #586210)
diff --git a/configure.ac b/configure.ac
index 1aba9e32..4b647c7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,5 +2,6 @@ AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
-AC_CONFIG_FILES([Makefile contrib/Makefile test/Makefile])
+AC_SUBST(helpersdir, $datadir/bash-completion/helpers)
+AC_CONFIG_FILES([Makefile contrib/Makefile helpers/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/contrib/perl b/contrib/perl
deleted file mode 100644
index 67996f94..00000000
--- a/contrib/perl
+++ /dev/null
@@ -1,127 +0,0 @@
-# bash completion for perl
-
-have perl &&
-{
-_perlmodules()
-{
-    COMPREPLY=( $( compgen -P "$prefix" -W "$( perl -e 'sub mods { my ($base,$dir)=@_; return if  $base !~ /^\Q$ENV{cur}/; chdir($dir) or return; for (glob(q[*.pm])) {s/\.pm$//; print qq[$base$_\n]}; mods(/^(?:[.\d]+|$Config{archname}-$Config{osname}|auto)$/ ? undef : qq[${base}${_}::],qq[$dir/$_]) for grep {-d} glob(q[*]); } mods(undef,$_) for @INC;' )" -- "$cur" ) )
-    __ltrim_colon_completions "$1"
-}
-
-_perl()
-{
-    local cur prev prefix temp
-    local optPrefix optSuffix
-
-    COMPREPLY=()
-    _get_comp_words_by_ref -n : cur prev
-    prefix=""
-
-    # If option not followed by whitespace, reassign prev and cur
-    if [[ "$cur" == -?* ]]; then
-        temp=$cur
-        prev=${temp:0:2}
-        cur=${temp:2}
-        optPrefix=-P$prev
-        optSuffix=-S/
-        prefix=$prev
-    fi
-
-    # only handle module completion for now
-    case $prev in
-        -I|-x)
-            local IFS=$'\t\n'
-            COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
-            return 0
-            ;;
-        -m|-M)
-            _perlmodules "$cur"
-            return 0
-            ;;
-    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" ) )
-    else
-        _filedir
-    fi
-}
-complete -F _perl -o nospace -o filenames perl
-
-_perldoc()
-{
-    local cur prev prefix temp
-
-    COMPREPLY=()
-    _get_comp_words_by_ref -n : cur prev
-    prefix=""
-
-    # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -?* ]]; then
-        temp=$cur
-        prev=${temp:0:2}
-        cur=${temp:2}
-        prefix=$prev
-    fi
-
-    # complete builtin perl functions
-    case $prev in
-        -f)
-            COMPREPLY=( $( compgen -W 'chomp chop chr crypt hex index lc \
-                lcfirst length oct ord pack q qq reverse rindex sprintf \
-                substr tr uc ucfirst y m pos quotemeta s split study qr abs \
-                atan2 cos exp hex int log oct rand sin sqrt srand pop push \
-                shift splice unshift grep join map qw reverse sort unpack \
-                delete each exists keys values binmode close closedir \
-                dbmclose dbmopen die eof fileno flock format getc print \
-                printf read readdir rewinddir say seek seekdir select syscall \
-                sysread sysseek syswrite tell telldir truncate warn write \
-                pack read syscall sysread syswrite unpack vec -X chdir chmod \
-                chown chroot fcntl glob ioctl link lstat mkdir open opendir \
-                readlink rename rmdir stat symlink umask unlink utime caller \
-                continue do dump eval exit goto last next redo return \
-                sub wantarray break caller import local my our state package \
-                use defined formline reset scalar undef \
-                alarm exec fork getpgrp getppid getpriority kill pipe qx \
-                setpgrp setpriority sleep system times wait waitpid \
-                import no package require use bless dbmclose dbmopen package \
-                ref tie tied untie use accept bind connect getpeername \
-                getsockname getsockopt listen recv send setsockopt shutdown \
-                socket socketpair msgctl msgget msgrcv msgsnd semctl semget \
-                semop shmctl shmget shmread shmwrite endgrent endhostent \
-                endnetent endpwent getgrent getgrgid getgrnam getlogin \
-                getpwent getpwnam getpwuid setgrent setpwent endprotoent \
-                endservent gethostbyaddr gethostbyname gethostent \
-                getnetbyaddr getnetbyname getnetent getprotobyname \
-                getprotobynumber getprotoent getservbyname getservbyport \
-                getservent sethostent setnetent setprotoent setservent \
-                gmtime localtime time times lock' -- "$cur" ) )
-            return 0
-            ;;
-    esac
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-h -v -t -u -m -l -F -X -f -q' -- "$cur" ))
-    else
-        # return available modules (unless it is clearly a file)
-        if [[ "$cur" != */* ]]; then
-            _perlmodules "$cur"
-            COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
-                '$( PAGER=/bin/cat man perl |  \
-                sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
-                awk "\$NF=2 { print \$1}" | command grep perl )' -- "$cur" ) )
-        fi
-        _filedir '@(pl|PL|pm|PM|pod|POD)'
-    fi
-}
-complete -F _perldoc -o bashdefault perldoc
-}
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/perl.in b/contrib/perl.in
new file mode 100644
index 00000000..8fb7f5cf
--- /dev/null
+++ b/contrib/perl.in
@@ -0,0 +1,61 @@
+# bash completion for perl
+
+have perl &&
+{
+_perlmodules()
+{
+    COMPREPLY=( $( compgen -P "$prefix" -W "$( perl -e 'sub mods { my ($base,$dir)=@_; return if  $base !~ /^\Q$ENV{cur}/; chdir($dir) or return; for (glob(q[*.pm])) {s/\.pm$//; print qq[$base$_\n]}; mods(/^(?:[.\d]+|$Config{archname}-$Config{osname}|auto)$/ ? undef : qq[${base}${_}::],qq[$dir/$_]) for grep {-d} glob(q[*]); } mods(undef,$_) for @INC;' )" -- "$cur" ) )
+    __ltrim_colon_completions "$1"
+}
+
+_perl()
+{
+    local cur prev prefix temp
+    local optPrefix optSuffix
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n : cur prev
+    prefix=""
+
+    # If option not followed by whitespace, reassign prev and cur
+    if [[ "$cur" == -?* ]]; then
+        temp=$cur
+        prev=${temp:0:2}
+        cur=${temp:2}
+        optPrefix=-P$prev
+        optSuffix=-S/
+        prefix=$prev
+    fi
+
+    # only handle module completion for now
+    case $prev in
+        -I|-x)
+            local IFS=$'\t\n'
+            COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
+            return 0
+            ;;
+        -m|-M)
+            _perlmodules "$cur"
+            return 0
+            ;;
+    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" ) )
+    else
+        _filedir
+    fi
+}
+complete -F _perl -o nospace -o filenames perl
+
+complete -C @helpersdir@/perldoc -o nospace -o default perldoc
+}
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
new file mode 100644
index 00000000..991cfce0
--- /dev/null
+++ b/helpers/Makefile.am
@@ -0,0 +1,3 @@
+helpers_SCRIPTS = perldoc
+
+EXTRA_DIST = $(helpers_SCRIPTS)
diff --git a/helpers/perldoc b/helpers/perldoc
new file mode 100755
index 00000000..a366eed7
--- /dev/null
+++ b/helpers/perldoc
@@ -0,0 +1,102 @@
+#!/usr/bin/env perl
+use strict;
+use File::Spec::Functions qw( rel2abs catdir catfile no_upwards );
+
+sub uniq { my %seen; grep { not $seen{$_}++ } @_ }
+
+sub get_command_line {
+	my $comp = substr $ENV{'COMP_LINE'}, 0, $ENV{'COMP_POINT'};
+	return split /[ \t]+/, $comp, -1; # if not good enough, use Text::ParseWords
+}
+
+sub slurp_dir {
+	opendir my $dir, shift or return;
+	no_upwards readdir $dir;
+}
+
+sub suggestion_from_name {
+	my ( $file_rx, $path, $name ) = @_;
+	return if not $name =~ /$file_rx/;
+	return $name.'::' if -d catdir $path, $name;
+	return $1;
+}
+
+sub suggestions_from_path {
+	my ( $file_rx, $path ) = @_;
+	map { suggestion_from_name $file_rx, $path, $_ } slurp_dir $path;
+}
+
+sub get_package_suggestions {
+	my ( $pkg ) = @_;
+
+	my @segment = split /::|:\z/, $pkg, -1;
+	my $file_rx = qr/\A(${\quotemeta pop @segment}\w*)(?:\.pm|\.pod)?\z/;
+
+	my $home = rel2abs $ENV{'HOME'};
+	my $cwd = rel2abs do { require Cwd; Cwd::cwd() };
+
+	my @suggestion =
+		map { suggestions_from_path $file_rx, $_ }
+		uniq map { catdir $_, @segment }
+		grep { $home ne $_ and $cwd ne $_ }
+		map { $_, ( catdir $_, 'pod' ) }
+		map { rel2abs $_ }
+		@INC;
+
+	# fixups
+	if ( $pkg eq '' ) {
+		my $total = @suggestion;
+		@suggestion = grep { not /^perl/ } @suggestion;
+		my $num_hidden = $total - @suggestion;
+		push @suggestion, "perl* ($num_hidden hidden)" if $num_hidden;
+	}
+	elsif ( $pkg =~ /(?<!:):\z/ ) {
+		@suggestion = map { ":$_" } @suggestion;
+	}
+
+	return @suggestion;
+}
+
+sub get_function_suggestions {
+	my ( $func ) = @_;
+
+	my $perlfunc;
+	for ( @INC, undef ) {
+		return if not defined;
+		$perlfunc = catfile $_, qw( pod perlfunc.pod );
+		last if -r $perlfunc;
+	}
+
+	open my $fh, '<', $perlfunc or return;
+
+	my @suggestion;
+	my $nest_level = -1;
+	while ( <$fh> ) {
+		next if 1 .. /^=head2 Alphabetical Listing of Perl Functions$/;
+		++$nest_level if /^=over/;
+		--$nest_level if /^=back/;
+		next if $nest_level;
+		push @suggestion, /^=item (-?\w+)/;
+	}
+
+	my $func_rx = qr/\A${\quotemeta $func}/;
+
+	return grep { /$func_rx/ } @suggestion;
+}
+
+sub usage {
+	die map "\n$_\n", (
+		"To use, issue the following command in bash:",
+		"\tcomplete -C perldoc-complete -o nospace -o default perldoc",
+		"You probably want to put that line in your ~/.bashrc file.\n",
+	);
+}
+
+usage() if not exists $ENV{'COMP_LINE'};
+
+my ( $cmd, @arg ) = get_command_line();
+my $word = pop @arg;
+
+print "$_\n" for ( @arg and @arg[-1] eq '-f' )
+	? get_function_suggestions( $word )
+	: get_package_suggestions( $word );

From c030827fdce7f7bd647fa3ebce6841dcdce4f4ce Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Mon, 9 Aug 2010 22:24:52 +0200
Subject: [PATCH 031/214] dynamic creation of perldoc completion, to point to
 helper script

---
 contrib/Makefile.am | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6c5a5869..f8420e17 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-bashcomp_DATA = abook \
+static_bashcomp = abook \
 		ant \
 		apache2ctl \
 		apt \
@@ -99,7 +99,6 @@ bashcomp_DATA = abook \
 		openldap \
 		openssl \
 		p4 \
-		perl \
 		pine \
 		pkg-config \
 		pkg_install \
@@ -165,7 +164,14 @@ bashcomp_DATA = abook \
 		yp-tools \
 		yum-arch
 
-EXTRA_DIST = $(bashcomp_DATA) \
+generated_bashcomp = perl
+
+bashcomp_DATA = $(static_bashcomp) $(generated_bashcomp)
+
+perl: perl.in Makefile
+	sed -e 's|@helpersdir[@]|$(helpersdir)|' <$(srcdir)/$@.in >$@
+
+EXTRA_DIST = $(bashcomp_DATA) perl.in \
 	     _mock _modules _subversion _yum _yum-utils
 
 CLEANFILES = perl

From 30849031446ab7fb98342ddd73f2c75c04ab2449 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Mon, 9 Aug 2010 22:29:56 +0200
Subject: [PATCH 032/214] recurse in helpers dir

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ffc84429..df2140af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = contrib test
+SUBDIRS = contrib helpers test
 
 sysconf_DATA = bash_completion
 

From 9b97b40c4a646d847b52cf3eb19d0c1a1c1ee229 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Mon, 16 Aug 2010 21:17:51 +0200
Subject: [PATCH 033/214] don't source Makefiles when run from test suite

---
 bash_completion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index ef00f05a..cd717c52 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1625,7 +1625,7 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
     -x $BASH_COMPLETION_COMPAT_DIR ]]; then
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
         i=$BASH_COMPLETION_COMPAT_DIR/$i
-        [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \
+        [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
             && ( -f $i || -h $i ) && -r $i ]] && . "$i"
     done
 fi
@@ -1634,7 +1634,7 @@ if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
     -x $BASH_COMPLETION_DIR ]]; then
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do
         i=$BASH_COMPLETION_DIR/$i
-        [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) \
+        [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
             && ( -f $i || -h $i ) && -r $i ]] && . "$i"
     done
 fi

From b867bcd64fcac0fbfb610b1acc96895a719278c0 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 18 Aug 2010 23:01:26 +0200
Subject: [PATCH 034/214] Fix _filedir error message on bash-3 In case of `sudo
 cmd', _filedir might be triggered for a cmd not having a complete command,
 hence `complete -p cmd' could yield an error. (Alioth

---
 CHANGES                       | 1 +
 bash_completion               | 3 ++-
 test/lib/completions/sudo.exp | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index d0e70c68..947511e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ bash-completion (2.x)
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
   * Speed up `compopt' availability detection
+  * Fix _filedir `-o filenames' detection on bash-3 (Alioth: #312646)
 
   [ Anton Khirnov ]
   * Improve mplayer and mencoder completions.
diff --git a/bash_completion b/bash_completion
index cd717c52..8661d402 100644
--- a/bash_completion
+++ b/bash_completion
@@ -647,7 +647,8 @@ _filedir()
             # Is `-o filenames' set?
             [[ (
                 ${COMP_WORDS[0]} && 
-                "$(complete -p ${COMP_WORDS[0]})" == *"-o filenames"*
+                "$(complete -p ${COMP_WORDS[0]} &>/dev/null)" == \
+                    *"-o filenames"*
             ) ]] || {
                 # No, `-o filenames' isn't set;
                 # Emulate `-o filenames'
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index e7a39162..1afd9933 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -17,4 +17,10 @@ assert_complete "fixtures/shared/default/foo.d/" "sudo cd fixtures/shared/defaul
 sync_after_int
 
 
+assert_complete "fixtures/" "sudo sh fix"
+
+
+sync_after_int
+
+
 teardown

From 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Thu, 19 Aug 2010 13:36:47 +0200
Subject: [PATCH 035/214] merge iconv and getent completions, as they are both
 glibc utils

---
 contrib/Makefile.am       |  3 +--
 contrib/{getent => glibc} | 43 ++++++++++++++++++++++++++++++++++-
 contrib/iconv             | 48 ---------------------------------------
 3 files changed, 43 insertions(+), 51 deletions(-)
 rename contrib/{getent => glibc} (54%)
 delete mode 100644 contrib/iconv

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f8420e17..aceea785 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -42,15 +42,14 @@ static_bashcomp = abook \
 		gcl \
 		gdb \
 		genisoimage \
-		getent \
 		gkrellm \
+		glibc \
 		gnatmake \
 		gpg \
 		gpg2 \
 		gzip \
 		heimdal \
 		hping2 \
-		iconv \
 		ifupdown \
 		imagemagick \
 		info \
diff --git a/contrib/getent b/contrib/glibc
similarity index 54%
rename from contrib/getent
rename to contrib/glibc
index 54e62ab8..954a1c62 100644
--- a/contrib/getent
+++ b/contrib/glibc
@@ -1,5 +1,46 @@
-# bash completion for getent
+# Completions for tools included in glibc
 
+# iconv(1)
+have iconv &&
+_iconv()
+{
+    local cur prev split=false
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case $prev in
+        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
+        --widechar-subst)
+            return 0
+            ;;
+        -f|--from-code|-t|--to-code)
+            COMPREPLY=( $( compgen -W '$( iconv -l | \
+                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
+            return 0
+            ;;
+        -o|--output)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
+            --unicode-subst --byte-subst --widechar-subst --output --silent
+            --verbose --help --usage --version' -- "$cur" ) )
+        return 0
+    fi
+} &&
+complete -F _iconv -o default iconv
+# Intentionally not -o filenames here, -f/-t completions may contain slashes
+# and -o filenames would break them.
+
+# getent(1)
 have getent &&
 _getent()
 {
diff --git a/contrib/iconv b/contrib/iconv
deleted file mode 100644
index 14b618dc..00000000
--- a/contrib/iconv
+++ /dev/null
@@ -1,48 +0,0 @@
-# iconv(1) completion
-
-have iconv &&
-_iconv()
-{
-    local cur prev split=false
-
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev
-
-    _split_longopt && split=true
-
-    case $prev in
-        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
-        --widechar-subst)
-            return 0
-            ;;
-        -f|--from-code|-t|--to-code)
-            COMPREPLY=( $( compgen -W '$( iconv -l | \
-                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
-            return 0
-            ;;
-        -o|--output)
-            _filedir
-            return 0
-            ;;
-    esac
-
-    $split && return 0
-
-    if [[ "$cur" = -* ]]; then
-        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
-            --unicode-subst --byte-subst --widechar-subst --output --silent
-            --verbose --help --usage --version' -- "$cur" ) )
-        return 0
-    fi
-} &&
-complete -F _iconv -o default iconv
-# Intentionally not -o filenames here, -f/-t completions may contain slashes
-# and -o filenames would break them.
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
-# ex: ts=4 sw=4 et filetype=sh

From e846d84ed196a213f7a3c70c8e0b575ddfbf5746 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 20 Aug 2010 11:28:19 +0200
Subject: [PATCH 036/214] Fix _filedir to redirect only stderr

---
 bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index 8661d402..fed2d940 100644
--- a/bash_completion
+++ b/bash_completion
@@ -647,7 +647,7 @@ _filedir()
             # Is `-o filenames' set?
             [[ (
                 ${COMP_WORDS[0]} && 
-                "$(complete -p ${COMP_WORDS[0]} &>/dev/null)" == \
+                "$(complete -p ${COMP_WORDS[0]} 2>/dev/null)" == \
                     *"-o filenames"*
             ) ]] || {
                 # No, `-o filenames' isn't set;

From 37308e35949fc9cf463860c66b0666ab8ac2f9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 20 Aug 2010 13:35:12 +0300
Subject: [PATCH 037/214] Simplify _filedir arguments.

---
 contrib/mcrypt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mcrypt b/contrib/mcrypt
index e777150f..9e746fb1 100644
--- a/contrib/mcrypt
+++ b/contrib/mcrypt
@@ -58,12 +58,12 @@ _mcrypt()
             --list-hash --verbose --quiet --help \
             --version --license' -- "$cur" ) )
     elif [[ ${COMP_WORDS[0]} == mdecrypt ]]; then
-        _filedir '@(nc)'
+        _filedir nc
     else
         decrypt=0
         for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
             if [[ ${COMP_WORDS[i]} == -@(d|-decrypt) ]]; then
-                _filedir '@(nc)'
+                _filedir nc
                 decrypt=1
                 break
             fi

From 486369d45be92c0f1ffa55a153d645f1e01bb16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 20 Aug 2010 13:37:19 +0300
Subject: [PATCH 038/214] Add *.3gpp and *.3gpp2 to mplayer filename
 completions.

---
 CHANGES         | 3 ++-
 contrib/mplayer | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 947511e1..3fd2297e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,8 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add crontab and lrzip completions.
-  * Add *.gif (Alioth: #312512) and *.awb to mplayer filename completions.
+  * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
+    filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/* and sqlite3 completions.
   * Fix p4 completion (Alioth: #312625).
diff --git a/contrib/mplayer b/contrib/mplayer
index 6d1e977d..d51be1db 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)'
             ;;
     esac
 

From fa04cb811450d8c8e77b7c52c67b9914fec2409c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 20 Aug 2010 14:09:28 +0300
Subject: [PATCH 039/214] Add *.part to mplayer and xine-based player
 completions (Alioth: #312657).

---
 CHANGES         | 4 ++++
 bash_completion | 2 +-
 contrib/mplayer | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3fd2297e..7eada893 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,10 @@ bash-completion (2.x)
   [ Miklos Vajna ]
   * Add *.amr to mplayer file completions (Alioth: #312634).
 
+  [ Andrej Gelenberg ]
+  * Add *.part (partially downloaded) to mplayer and xine-based player
+    completions (Alioth: #312657).
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/bash_completion b/bash_completion
index fed2d940..ad45a8d7 100644
--- a/bash_completion
+++ b/bash_completion
@@ -93,7 +93,7 @@ complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 p
 complete -f -X '!*.texi*' makeinfo texi2html
 complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS|ltx|LTX)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
 complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay
-complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))' xine aaxine fbxine kaffeine dragon
+complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine kaffeine dragon
 complete -f -X '!*.@(avi|asf|wmv)' aviplay
 complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
diff --git a/contrib/mplayer b/contrib/mplayer
index d51be1db..ad458eba 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -236,7 +236,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)?(.part)'
             ;;
     esac
 

From 2d699bd8b54620791e54c32f1969c744aa20ac3d Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 22 Aug 2010 11:16:33 +0200
Subject: [PATCH 040/214] Revert "merge iconv and getent completions, as they
 are both glibc utils"

This reverts commit 3f0d8f8e9f1991e7d7610fd210c68421eef4e09f, as this is
only true for Linux
---
 contrib/Makefile.am       |  3 ++-
 contrib/{glibc => getent} | 43 +----------------------------------
 contrib/iconv             | 48 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 43 deletions(-)
 rename contrib/{glibc => getent} (54%)
 create mode 100644 contrib/iconv

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index aceea785..f8420e17 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -42,14 +42,15 @@ static_bashcomp = abook \
 		gcl \
 		gdb \
 		genisoimage \
+		getent \
 		gkrellm \
-		glibc \
 		gnatmake \
 		gpg \
 		gpg2 \
 		gzip \
 		heimdal \
 		hping2 \
+		iconv \
 		ifupdown \
 		imagemagick \
 		info \
diff --git a/contrib/glibc b/contrib/getent
similarity index 54%
rename from contrib/glibc
rename to contrib/getent
index 954a1c62..54e62ab8 100644
--- a/contrib/glibc
+++ b/contrib/getent
@@ -1,46 +1,5 @@
-# Completions for tools included in glibc
+# bash completion for getent
 
-# iconv(1)
-have iconv &&
-_iconv()
-{
-    local cur prev split=false
-
-    COMPREPLY=()
-    _get_comp_words_by_ref cur prev
-
-    _split_longopt && split=true
-
-    case $prev in
-        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
-        --widechar-subst)
-            return 0
-            ;;
-        -f|--from-code|-t|--to-code)
-            COMPREPLY=( $( compgen -W '$( iconv -l | \
-                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
-            return 0
-            ;;
-        -o|--output)
-            _filedir
-            return 0
-            ;;
-    esac
-
-    $split && return 0
-
-    if [[ "$cur" = -* ]]; then
-        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
-            --unicode-subst --byte-subst --widechar-subst --output --silent
-            --verbose --help --usage --version' -- "$cur" ) )
-        return 0
-    fi
-} &&
-complete -F _iconv -o default iconv
-# Intentionally not -o filenames here, -f/-t completions may contain slashes
-# and -o filenames would break them.
-
-# getent(1)
 have getent &&
 _getent()
 {
diff --git a/contrib/iconv b/contrib/iconv
new file mode 100644
index 00000000..14b618dc
--- /dev/null
+++ b/contrib/iconv
@@ -0,0 +1,48 @@
+# iconv(1) completion
+
+have iconv &&
+_iconv()
+{
+    local cur prev split=false
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case $prev in
+        -'?'|--help|--usage|-V|--version|--unicode-subst|--byte-subst|\
+        --widechar-subst)
+            return 0
+            ;;
+        -f|--from-code|-t|--to-code)
+            COMPREPLY=( $( compgen -W '$( iconv -l | \
+                sed -e "s@/*\$@@" -e "s/[,()]//g" )' -- "$cur" ) )
+            return 0
+            ;;
+        -o|--output)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $( compgen -W '--from-code --to-code --list -c
+            --unicode-subst --byte-subst --widechar-subst --output --silent
+            --verbose --help --usage --version' -- "$cur" ) )
+        return 0
+    fi
+} &&
+complete -F _iconv -o default iconv
+# Intentionally not -o filenames here, -f/-t completions may contain slashes
+# and -o filenames would break them.
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh

From 217735d807e1809d8dd4eae2f6aeb3810676d513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 3 Sep 2010 20:23:35 +0300
Subject: [PATCH 041/214] Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint
 filename completions.

---
 CHANGES         | 1 +
 contrib/xmllint | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 7eada893..48a98137 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ bash-completion (2.x)
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/* and sqlite3 completions.
   * Fix p4 completion (Alioth: #312625).
+  * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/contrib/xmllint b/contrib/xmllint
index 82feb4a3..d8b5051c 100644
--- a/contrib/xmllint
+++ b/contrib/xmllint
@@ -42,7 +42,7 @@ _xmllint()
         return 0
     fi
 
-    _filedir '@(*ml|htm|svg)'
+    _filedir '@(*ml|htm|svg|xs[dl]|rng|wsdl)'
 } &&
 complete -F _xmllint -o filenames xmllint
 

From 4d0b8be863f4ae2fc254f7571622ab84a2fccc2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Sep 2010 00:03:10 +0300
Subject: [PATCH 042/214] Recognize rpm query mode based on the --file,
 --group, --package, and --all long options (RedHat: #630328).

---
 CHANGES     |  2 ++
 contrib/rpm | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 48a98137..d41dccb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,8 @@ bash-completion (2.x)
   * Improve /etc/init.d/* and sqlite3 completions.
   * Fix p4 completion (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
+  * Recognize rpm query mode based on the --file, --group, --package, and
+    --all long options (RedHat: #630328).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/contrib/rpm b/contrib/rpm
index 20f98522..ceb4cfc3 100644
--- a/contrib/rpm
+++ b/contrib/rpm
@@ -185,7 +185,7 @@ _rpm()
                 --queryformat --rcfile --requires --scripts --suggests
                 --triggeredby --triggers --whatprovides --whatrequires --xml"
 
-            if [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then
+            if [ "${COMP_LINE#* -@(*([^ -])f|-file )}" != "$COMP_LINE" ]; then
                 # -qf completion
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
@@ -193,10 +193,10 @@ _rpm()
                 else
                     _filedir
                 fi
-            elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then
+            elif [ "${COMP_LINE#* -@(*([^ -])g|-group )}" != "$COMP_LINE" ]; then
                 # -qg completion
                 _rpm_groups
-            elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
+            elif [ "${COMP_LINE#* -@(*([^ -])p|-package )}" != "$COMP_LINE" ]; then
                 # -qp; uninstalled package completion
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
@@ -209,7 +209,7 @@ _rpm()
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
                         --last --root --state" -- "$cur" ) )
-                elif [ "${COMP_LINE#* -*([^ -])a}" == "$COMP_LINE" ]; then
+                elif [ "${COMP_LINE#* -@(*([^ -])a|-all )}" == "$COMP_LINE" ]; then
                     _rpm_installed_packages "$nodig" "$nosig"
                 fi
             fi
@@ -229,11 +229,11 @@ _rpm()
                     --nofiles --noscripts --nomd5 --querytags --specfile \
                     --whatrequires --whatprovides" -- "$cur" ) )
             # check whether we're doing file completion
-            elif [ "${COMP_LINE#* -*([^ -])f}" != "$COMP_LINE" ]; then
+            elif [ "${COMP_LINE#* -@(*([^ -])f|-file )}" != "$COMP_LINE" ]; then
                 _filedir
-            elif [ "${COMP_LINE#* -*([^ -])g}" != "$COMP_LINE" ]; then
+            elif [ "${COMP_LINE#* -@(*([^ -])g|-group )}" != "$COMP_LINE" ]; then
                 _rpm_groups
-            elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
+            elif [ "${COMP_LINE#* -@(*([^ -])p|-package )}" != "$COMP_LINE" ]; then
                 _filedir 'rpm'
             else
                 _rpm_installed_packages "$nodig" "$nosig"

From c8fb5f2eb1df48fd98e370967829d3e65d7c9f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Sep 2010 00:12:24 +0300
Subject: [PATCH 043/214] Simplify rpm query mode detection expressions.

---
 contrib/rpm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/rpm b/contrib/rpm
index ceb4cfc3..1be2ff52 100644
--- a/contrib/rpm
+++ b/contrib/rpm
@@ -185,7 +185,7 @@ _rpm()
                 --queryformat --rcfile --requires --scripts --suggests
                 --triggeredby --triggers --whatprovides --whatrequires --xml"
 
-            if [ "${COMP_LINE#* -@(*([^ -])f|-file )}" != "$COMP_LINE" ]; then
+            if [[ $COMP_LINE == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
@@ -193,10 +193,10 @@ _rpm()
                 else
                     _filedir
                 fi
-            elif [ "${COMP_LINE#* -@(*([^ -])g|-group )}" != "$COMP_LINE" ]; then
+            elif [[ $COMP_LINE == *\ -@(*([^ -])g|-group )* ]]; then
                 # -qg completion
                 _rpm_groups
-            elif [ "${COMP_LINE#* -@(*([^ -])p|-package )}" != "$COMP_LINE" ]; then
+            elif [[ $COMP_LINE == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
@@ -209,7 +209,7 @@ _rpm()
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
                         --last --root --state" -- "$cur" ) )
-                elif [ "${COMP_LINE#* -@(*([^ -])a|-all )}" == "$COMP_LINE" ]; then
+                elif [[ $COMP_LINE != *\ -@(*([^ -])a|-all )* ]]; then
                     _rpm_installed_packages "$nodig" "$nosig"
                 fi
             fi
@@ -229,11 +229,11 @@ _rpm()
                     --nofiles --noscripts --nomd5 --querytags --specfile \
                     --whatrequires --whatprovides" -- "$cur" ) )
             # check whether we're doing file completion
-            elif [ "${COMP_LINE#* -@(*([^ -])f|-file )}" != "$COMP_LINE" ]; then
+            elif [[ $COMP_LINE == *\ -@(*([^ -])f|-file )* ]]; then
                 _filedir
-            elif [ "${COMP_LINE#* -@(*([^ -])g|-group )}" != "$COMP_LINE" ]; then
+            elif [[ $COMP_LINE == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups
-            elif [ "${COMP_LINE#* -@(*([^ -])p|-package )}" != "$COMP_LINE" ]; then
+            elif [[ $COMP_LINE == *\ -@(*([^ -])p|-package )* ]]; then
                 _filedir 'rpm'
             else
                 _rpm_installed_packages "$nodig" "$nosig"

From a26e92e6f35e80f931788f30851ad378ead39961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Sep 2010 10:44:10 +0300
Subject: [PATCH 044/214] Improve rpm query option completions.

Add --nomanifest, --all, --file, --fileid, --ftswalk, --group, --hdrid,
--package, --pkgid, and --specfile; suggest --triggeredby, --whatprovides,
and --whatrequires only in installed package query mode.
---
 CHANGES     |  1 +
 contrib/rpm | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index d41dccb4..1628488c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ bash-completion (2.x)
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
     --all long options (RedHat: #630328).
+  * Improve rpm query option completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/contrib/rpm b/contrib/rpm
index 1be2ff52..d268cabd 100644
--- a/contrib/rpm
+++ b/contrib/rpm
@@ -142,7 +142,7 @@ _rpm()
                 -- "$cur" ) )
             return 0
             ;;
-        --define|-D)
+        --define|-D|--fileid|--hdrid|--pkgid)
             # argument required but no completions available
             return 0
             ;;
@@ -180,10 +180,9 @@ _rpm()
             # options common to all query types
             opts="$opts --changelog --configfiles --conflicts --docfiles
                 --dump --enhances --filesbypkg --filecaps --fileclass
-                --filecolor --fileprovide --filerequire --filesbypkg
-                --info --list --obsoletes --pipe --provides
-                --queryformat --rcfile --requires --scripts --suggests
-                --triggeredby --triggers --whatprovides --whatrequires --xml"
+                --filecolor --fileprovide --filerequire --filesbypkg --info
+                --list --obsoletes --pipe --provides --queryformat --rcfile
+                --requires --scripts --suggests --triggers --xml"
 
             if [[ $COMP_LINE == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
@@ -200,15 +199,18 @@ _rpm()
                 # -qp; uninstalled package completion
                 if [[ "$cur" == -* ]]; then
                     COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
-                        --httpport --httpproxy" -- "$cur" ) )
+                        --httpport --httpproxy --nomanifest" -- "$cur" ) )
                 else
                     _filedir 'rpm'
                 fi
             else
                 # -q; installed package completion
                 if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $( compgen -W "$opts --dbpath --fscontext \
-                        --last --root --state" -- "$cur" ) )
+                    COMPREPLY=( $( compgen -W "$opts --all --file --fileid
+                        --dbpath --fscontext --ftswalk --group --hdrid --last
+                        --package --pkgid --root --specfile --state 
+                        --triggeredby --whatprovides --whatrequires" \
+                            -- "$cur" ) )
                 elif [[ $COMP_LINE != *\ -@(*([^ -])a|-all )* ]]; then
                     _rpm_installed_packages "$nodig" "$nosig"
                 fi

From 063013969700f71d4edc911ac6dee7c4e3a7b744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Sep 2010 11:02:03 +0300
Subject: [PATCH 045/214] Add POSIX sh completion.

---
 CHANGES                     |  2 +-
 contrib/Makefile.am         |  1 +
 contrib/sh                  | 41 +++++++++++++++++++++++++++++++++++++
 test/completion/sh.exp      |  1 +
 test/lib/completions/sh.exp | 38 ++++++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 contrib/sh
 create mode 100644 test/completion/sh.exp
 create mode 100644 test/lib/completions/sh.exp

diff --git a/CHANGES b/CHANGES
index 1628488c..79c8396f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab and lrzip completions.
+  * Add crontab, lrzip, and POSIX sh completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f8420e17..3733c602 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -129,6 +129,7 @@ static_bashcomp = abook \
 		sbcl \
 		screen \
 		service \
+		sh \
 		shadow \
 		sitecopy \
 		smartctl \
diff --git a/contrib/sh b/contrib/sh
new file mode 100644
index 00000000..f33705de
--- /dev/null
+++ b/contrib/sh
@@ -0,0 +1,41 @@
+# POSIX sh(1) completion
+
+have sh &&
+_sh()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -c)
+            return 0
+            ;;
+        -o|+o)
+            COMPREPLY=( $( compgen -W 'allexport errexit ignoreeof monitor
+                noclobber noglob noexec nolog notify nounset verbose vi
+                xtrace' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    local opts="-a -b -C -e -f -h -i -m -n -o -u -v -x"
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W "$opts -c -s" -- "$cur" ) )
+        return 0
+    elif [[ "$cur" == +* ]]; then
+        COMPREPLY=( $( compgen -W "${opts//-/+}" -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir sh
+} &&
+complete -F _sh -o filenames sh
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/sh.exp b/test/completion/sh.exp
new file mode 100644
index 00000000..599f3b29
--- /dev/null
+++ b/test/completion/sh.exp
@@ -0,0 +1 @@
+assert_source_completions sh
diff --git a/test/lib/completions/sh.exp b/test/lib/completions/sh.exp
new file mode 100644
index 00000000..e1a51bb9
--- /dev/null
+++ b/test/lib/completions/sh.exp
@@ -0,0 +1,38 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "sh -"
+
+
+sync_after_int
+
+
+assert_complete_any "sh +"
+
+
+sync_after_int
+
+
+assert_complete_any "sh -o "
+
+
+sync_after_int
+
+
+assert_no_complete "sh -c "
+
+
+sync_after_int
+
+
+teardown

From c78db545f56bb7d29eb71953f0e0660e843515b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 10 Sep 2010 00:12:03 +0300
Subject: [PATCH 046/214] Add iftop(8) completion.

---
 CHANGES                        |  2 +-
 contrib/Makefile.am            |  1 +
 contrib/iftop                  | 35 ++++++++++++++++++++++++++++++++++
 test/completion/iftop.exp      |  1 +
 test/lib/completions/iftop.exp | 20 +++++++++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 contrib/iftop
 create mode 100644 test/completion/iftop.exp
 create mode 100644 test/lib/completions/iftop.exp

diff --git a/CHANGES b/CHANGES
index 79c8396f..a2a317a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab, lrzip, and POSIX sh completions.
+  * Add crontab, iftop, lrzip, and POSIX sh completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3733c602..ea129d03 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -51,6 +51,7 @@ static_bashcomp = abook \
 		heimdal \
 		hping2 \
 		iconv \
+		iftop \
 		ifupdown \
 		imagemagick \
 		info \
diff --git a/contrib/iftop b/contrib/iftop
new file mode 100644
index 00000000..eefcf9c6
--- /dev/null
+++ b/contrib/iftop
@@ -0,0 +1,35 @@
+# iftop(8) completion
+
+have iftop &&
+_iftop()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -h|-f|-F|-m)
+            return 0
+            ;;
+        -i)
+            _available_interfaces -a
+            return 0
+            ;;
+        -c)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    COMPREPLY=( $( compgen -W '-h -n -N -p -P -b -B -i -f -F -c -m' \
+        -- "$cur" ) )
+} &&
+complete -F _iftop -o filenames iftop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/iftop.exp b/test/completion/iftop.exp
new file mode 100644
index 00000000..5ec1cb57
--- /dev/null
+++ b/test/completion/iftop.exp
@@ -0,0 +1 @@
+assert_source_completions iftop
diff --git a/test/lib/completions/iftop.exp b/test/lib/completions/iftop.exp
new file mode 100644
index 00000000..12941610
--- /dev/null
+++ b/test/lib/completions/iftop.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "iftop "
+
+
+sync_after_int
+
+
+teardown

From a3ae00956daceceda9a1f44f955b35fa110b33fa Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 11:37:58 +0200
Subject: [PATCH 047/214] add freerdp completion

---
 contrib/Makefile.am              |  1 +
 contrib/freerdp                  | 47 ++++++++++++++++++++++++++++++++
 test/completion/freerdp.exp      |  1 +
 test/lib/completions/freerdp.exp | 20 ++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 contrib/freerdp
 create mode 100644 test/completion/freerdp.exp
 create mode 100644 test/lib/completions/freerdp.exp

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ea129d03..b3aea2d9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -37,6 +37,7 @@ static_bashcomp = abook \
 		dsniff \
 		findutils \
 		freeciv \
+		freerdp \
 		fuse \
 		gcc \
 		gcl \
diff --git a/contrib/freerdp b/contrib/freerdp
new file mode 100644
index 00000000..82a46462
--- /dev/null
+++ b/contrib/freerdp
@@ -0,0 +1,47 @@
+# bash completion for xfreerdp
+
+have xfreerdp &&
+_xfreerdp()
+{
+    local cur prev
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -k)
+            COMPREPLY=( $( compgen -W "$(xfreerdp --kbd-list | \
+		    awk '/^0x/ {print $1}')" -- "$cur" ) )
+            return 0
+            ;;
+        -a)
+            COMPREPLY=( $( compgen -W '8 15 16 24 32' -- "$cur" ) )
+            return 0
+            ;;
+        -x)
+            COMPREPLY=( $( compgen -W 'b broadband m modem l lan' -- $cur ) )
+            return 0
+            ;;
+        --plugin)
+            COMPREPLY=( $( compgen -W 'cliprdr rdpsnd rdpdr' -- "$cur" ) )
+            return 0
+            ;;
+    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" ) )
+    else
+        _known_hosts_real "$cur"
+    fi
+
+} &&
+complete -F _xfreerdp xfreerdp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/freerdp.exp b/test/completion/freerdp.exp
new file mode 100644
index 00000000..5ca649a2
--- /dev/null
+++ b/test/completion/freerdp.exp
@@ -0,0 +1 @@
+assert_source_completions xfreerdp
diff --git a/test/lib/completions/freerdp.exp b/test/lib/completions/freerdp.exp
new file mode 100644
index 00000000..be61d459
--- /dev/null
+++ b/test/lib/completions/freerdp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xfreerdp"
+
+
+sync_after_int
+
+
+teardown

From ff6172097df8fda0f1085528b74f63887c876f91 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 16:38:59 +0200
Subject: [PATCH 048/214] symlinks are automatically dereferenced for -f test,
 so don't use -h test

---
 bash_completion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index ad45a8d7..eabb38d6 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1627,7 +1627,7 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
         i=$BASH_COMPLETION_COMPAT_DIR/$i
         [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
-            && ( -f $i || -h $i ) && -r $i ]] && . "$i"
+            && -f $i && -r $i ]] && . "$i"
     done
 fi
 if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
@@ -1636,7 +1636,7 @@ if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do
         i=$BASH_COMPLETION_DIR/$i
         [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
-            && ( -f $i || -h $i ) && -r $i ]] && . "$i"
+            && -f $i && -r $i ]] && . "$i"
     done
 fi
 unset i

From c85a8b9a3e36beabb3c95ff36404aaee71de878f Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 16:39:30 +0200
Subject: [PATCH 049/214] install helpers in a subdirectory of completions

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4b647c7c..1879a51e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,6 @@ AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
-AC_SUBST(helpersdir, $datadir/bash-completion/helpers)
+AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
 AC_CONFIG_FILES([Makefile contrib/Makefile helpers/Makefile test/Makefile])
 AC_OUTPUT

From 276e3a780ec48fe1577c45e73d62bc68c70b1c00 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 16:40:04 +0200
Subject: [PATCH 050/214] use BASH_COMPLETION_DIR for locating helpers,
 avoiding the use of an install-time substitution

---
 contrib/Makefile.am       | 15 +++------------
 contrib/{perl.in => perl} |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)
 rename contrib/{perl.in => perl} (95%)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index b3aea2d9..86f62251 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-static_bashcomp = abook \
+bashcomp_DATA = abook \
 		ant \
 		apache2ctl \
 		apt \
@@ -101,6 +101,7 @@ static_bashcomp = abook \
 		openldap \
 		openssl \
 		p4 \
+		perl \
 		pine \
 		pkg-config \
 		pkg_install \
@@ -167,15 +168,5 @@ static_bashcomp = abook \
 		yp-tools \
 		yum-arch
 
-generated_bashcomp = perl
-
-bashcomp_DATA = $(static_bashcomp) $(generated_bashcomp)
-
-perl: perl.in Makefile
-	sed -e 's|@helpersdir[@]|$(helpersdir)|' <$(srcdir)/$@.in >$@
-
-EXTRA_DIST = $(bashcomp_DATA) perl.in \
+EXTRA_DIST = $(bashcomp_DATA) \
 	     _mock _modules _subversion _yum _yum-utils
-
-CLEANFILES = perl
-
diff --git a/contrib/perl.in b/contrib/perl
similarity index 95%
rename from contrib/perl.in
rename to contrib/perl
index 8fb7f5cf..ea71b2f4 100644
--- a/contrib/perl.in
+++ b/contrib/perl
@@ -49,7 +49,7 @@ _perl()
 }
 complete -F _perl -o nospace -o filenames perl
 
-complete -C @helpersdir@/perldoc -o nospace -o default perldoc
+complete -C $BASH_COMPLETION_DIR/helpers/perldoc -o nospace -o default perldoc
 }
 
 # Local variables:

From cb7fc2f7c4a4c7c5a665c5bf8b73b40fc5e268a9 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 16:42:21 +0200
Subject: [PATCH 051/214] rename 'contrib' directory to 'completions'

---
 Makefile.am                                  | 2 +-
 {contrib => completions}/Makefile.am         | 0
 {contrib => completions}/_mock               | 0
 {contrib => completions}/_modules            | 0
 {contrib => completions}/_subversion         | 0
 {contrib => completions}/_yum                | 0
 {contrib => completions}/_yum-utils          | 0
 {contrib => completions}/abook               | 0
 {contrib => completions}/ant                 | 0
 {contrib => completions}/apache2ctl          | 0
 {contrib => completions}/apt                 | 0
 {contrib => completions}/apt-build           | 0
 {contrib => completions}/aptitude            | 0
 {contrib => completions}/aspell              | 0
 {contrib => completions}/autorpm             | 0
 {contrib => completions}/bash-builtins       | 0
 {contrib => completions}/bind-utils          | 0
 {contrib => completions}/bitkeeper           | 0
 {contrib => completions}/bittorrent          | 0
 {contrib => completions}/bluez               | 0
 {contrib => completions}/brctl               | 0
 {contrib => completions}/bzip2               | 0
 {contrib => completions}/cardctl             | 0
 {contrib => completions}/cfengine            | 0
 {contrib => completions}/chkconfig           | 0
 {contrib => completions}/chsh                | 0
 {contrib => completions}/cksfv               | 0
 {contrib => completions}/clisp               | 0
 {contrib => completions}/configure           | 0
 {contrib => completions}/coreutils           | 0
 {contrib => completions}/cowsay              | 0
 {contrib => completions}/cpan2dist           | 0
 {contrib => completions}/cpio                | 0
 {contrib => completions}/crontab             | 0
 {contrib => completions}/cryptsetup          | 0
 {contrib => completions}/cups                | 0
 {contrib => completions}/cvs                 | 0
 {contrib => completions}/cvsps               | 0
 {contrib => completions}/dd                  | 0
 {contrib => completions}/dhclient            | 0
 {contrib => completions}/dict                | 0
 {contrib => completions}/dpkg                | 0
 {contrib => completions}/dselect             | 0
 {contrib => completions}/dsniff              | 0
 {contrib => completions}/findutils           | 0
 {contrib => completions}/freeciv             | 0
 {contrib => completions}/freerdp             | 0
 {contrib => completions}/fuse                | 0
 {contrib => completions}/gcc                 | 0
 {contrib => completions}/gcl                 | 0
 {contrib => completions}/gdb                 | 0
 {contrib => completions}/genisoimage         | 0
 {contrib => completions}/getent              | 0
 {contrib => completions}/gkrellm             | 0
 {contrib => completions}/gnatmake            | 0
 {contrib => completions}/gpg                 | 0
 {contrib => completions}/gpg2                | 0
 {contrib => completions}/gzip                | 0
 {contrib => completions}/heimdal             | 0
 {contrib => completions}/hping2              | 0
 {contrib => completions}/iconv               | 0
 {contrib => completions}/iftop               | 0
 {contrib => completions}/ifupdown            | 0
 {contrib => completions}/imagemagick         | 0
 {contrib => completions}/info                | 0
 {contrib => completions}/ipmitool            | 0
 {contrib => completions}/ipsec               | 0
 {contrib => completions}/iptables            | 0
 {contrib => completions}/ipv6calc            | 0
 {contrib => completions}/isql                | 0
 {contrib => completions}/jar                 | 0
 {contrib => completions}/java                | 0
 {contrib => completions}/k3b                 | 0
 {contrib => completions}/kldload             | 0
 {contrib => completions}/larch               | 0
 {contrib => completions}/ldapvi              | 0
 {contrib => completions}/lftp                | 0
 {contrib => completions}/lilo                | 0
 {contrib => completions}/links               | 0
 {contrib => completions}/lintian             | 0
 {contrib => completions}/lisp                | 0
 {contrib => completions}/lrzip               | 0
 {contrib => completions}/lvm                 | 0
 {contrib => completions}/lzma                | 0
 {contrib => completions}/lzop                | 0
 {contrib => completions}/mailman             | 0
 {contrib => completions}/make                | 0
 {contrib => completions}/man                 | 0
 {contrib => completions}/mc                  | 0
 {contrib => completions}/mcrypt              | 0
 {contrib => completions}/mdadm               | 0
 {contrib => completions}/medusa              | 0
 {contrib => completions}/minicom             | 0
 {contrib => completions}/mkinitrd            | 0
 {contrib => completions}/module-init-tools   | 0
 {contrib => completions}/monodevelop         | 0
 {contrib => completions}/mount               | 0
 {contrib => completions}/mplayer             | 0
 {contrib => completions}/msynctool           | 0
 {contrib => completions}/mtx                 | 0
 {contrib => completions}/munin-node          | 0
 {contrib => completions}/mutt                | 0
 {contrib => completions}/mysqladmin          | 0
 {contrib => completions}/ncftp               | 0
 {contrib => completions}/net-tools           | 0
 {contrib => completions}/nmap                | 0
 {contrib => completions}/ntpdate             | 0
 {contrib => completions}/openldap            | 0
 {contrib => completions}/openssl             | 0
 {contrib => completions}/p4                  | 0
 {contrib => completions}/perl                | 0
 {contrib => completions}/pine                | 0
 {contrib => completions}/pkg-config          | 0
 {contrib => completions}/pkg_install         | 0
 {contrib => completions}/pkgtools            | 0
 {contrib => completions}/pm-utils            | 0
 {contrib => completions}/portupgrade         | 0
 {contrib => completions}/postfix             | 0
 {contrib => completions}/postgresql          | 0
 {contrib => completions}/povray              | 0
 {contrib => completions}/procps              | 0
 {contrib => completions}/python              | 0
 {contrib => completions}/qdbus               | 0
 {contrib => completions}/qemu                | 0
 {contrib => completions}/quota-tools         | 0
 {contrib => completions}/rcs                 | 0
 {contrib => completions}/rdesktop            | 0
 {contrib => completions}/reportbug           | 0
 {contrib => completions}/resolvconf          | 0
 {contrib => completions}/rfkill              | 0
 {contrib => completions}/ri                  | 0
 {contrib => completions}/rpcdebug            | 0
 {contrib => completions}/rpm                 | 0
 {contrib => completions}/rpmcheck            | 0
 {contrib => completions}/rrdtool             | 0
 {contrib => completions}/rsync               | 0
 {contrib => completions}/rtcwake             | 0
 {contrib => completions}/samba               | 0
 {contrib => completions}/sbcl                | 0
 {contrib => completions}/screen              | 0
 {contrib => completions}/service             | 0
 {contrib => completions}/sh                  | 0
 {contrib => completions}/shadow              | 0
 {contrib => completions}/sitecopy            | 0
 {contrib => completions}/smartctl            | 0
 {contrib => completions}/snownews            | 0
 {contrib => completions}/sqlite3             | 0
 {contrib => completions}/ssh                 | 0
 {contrib => completions}/sshfs               | 0
 {contrib => completions}/strace              | 0
 {contrib => completions}/svk                 | 0
 {contrib => completions}/sysctl              | 0
 {contrib => completions}/sysv-rc             | 0
 {contrib => completions}/tar                 | 0
 {contrib => completions}/tcpdump             | 0
 {contrib => completions}/unace               | 0
 {contrib => completions}/unrar               | 0
 {contrib => completions}/update-alternatives | 0
 {contrib => completions}/util-linux          | 0
 {contrib => completions}/vncviewer           | 0
 {contrib => completions}/vpnc                | 0
 {contrib => completions}/wireless-tools      | 0
 {contrib => completions}/wodim               | 0
 {contrib => completions}/wol                 | 0
 {contrib => completions}/wtf                 | 0
 {contrib => completions}/wvdial              | 0
 {contrib => completions}/xhost               | 0
 {contrib => completions}/xm                  | 0
 {contrib => completions}/xmllint             | 0
 {contrib => completions}/xmlwf               | 0
 {contrib => completions}/xmms                | 0
 {contrib => completions}/xrandr              | 0
 {contrib => completions}/xsltproc            | 0
 {contrib => completions}/xz                  | 0
 {contrib => completions}/yp-tools            | 0
 {contrib => completions}/yum-arch            | 0
 configure.ac                                 | 2 +-
 177 files changed, 2 insertions(+), 2 deletions(-)
 rename {contrib => completions}/Makefile.am (100%)
 rename {contrib => completions}/_mock (100%)
 rename {contrib => completions}/_modules (100%)
 rename {contrib => completions}/_subversion (100%)
 rename {contrib => completions}/_yum (100%)
 rename {contrib => completions}/_yum-utils (100%)
 rename {contrib => completions}/abook (100%)
 rename {contrib => completions}/ant (100%)
 rename {contrib => completions}/apache2ctl (100%)
 rename {contrib => completions}/apt (100%)
 rename {contrib => completions}/apt-build (100%)
 rename {contrib => completions}/aptitude (100%)
 rename {contrib => completions}/aspell (100%)
 rename {contrib => completions}/autorpm (100%)
 rename {contrib => completions}/bash-builtins (100%)
 rename {contrib => completions}/bind-utils (100%)
 rename {contrib => completions}/bitkeeper (100%)
 rename {contrib => completions}/bittorrent (100%)
 rename {contrib => completions}/bluez (100%)
 rename {contrib => completions}/brctl (100%)
 rename {contrib => completions}/bzip2 (100%)
 rename {contrib => completions}/cardctl (100%)
 rename {contrib => completions}/cfengine (100%)
 rename {contrib => completions}/chkconfig (100%)
 rename {contrib => completions}/chsh (100%)
 rename {contrib => completions}/cksfv (100%)
 rename {contrib => completions}/clisp (100%)
 rename {contrib => completions}/configure (100%)
 rename {contrib => completions}/coreutils (100%)
 rename {contrib => completions}/cowsay (100%)
 rename {contrib => completions}/cpan2dist (100%)
 rename {contrib => completions}/cpio (100%)
 rename {contrib => completions}/crontab (100%)
 rename {contrib => completions}/cryptsetup (100%)
 rename {contrib => completions}/cups (100%)
 rename {contrib => completions}/cvs (100%)
 rename {contrib => completions}/cvsps (100%)
 rename {contrib => completions}/dd (100%)
 rename {contrib => completions}/dhclient (100%)
 rename {contrib => completions}/dict (100%)
 rename {contrib => completions}/dpkg (100%)
 rename {contrib => completions}/dselect (100%)
 rename {contrib => completions}/dsniff (100%)
 rename {contrib => completions}/findutils (100%)
 rename {contrib => completions}/freeciv (100%)
 rename {contrib => completions}/freerdp (100%)
 rename {contrib => completions}/fuse (100%)
 rename {contrib => completions}/gcc (100%)
 rename {contrib => completions}/gcl (100%)
 rename {contrib => completions}/gdb (100%)
 rename {contrib => completions}/genisoimage (100%)
 rename {contrib => completions}/getent (100%)
 rename {contrib => completions}/gkrellm (100%)
 rename {contrib => completions}/gnatmake (100%)
 rename {contrib => completions}/gpg (100%)
 rename {contrib => completions}/gpg2 (100%)
 rename {contrib => completions}/gzip (100%)
 rename {contrib => completions}/heimdal (100%)
 rename {contrib => completions}/hping2 (100%)
 rename {contrib => completions}/iconv (100%)
 rename {contrib => completions}/iftop (100%)
 rename {contrib => completions}/ifupdown (100%)
 rename {contrib => completions}/imagemagick (100%)
 rename {contrib => completions}/info (100%)
 rename {contrib => completions}/ipmitool (100%)
 rename {contrib => completions}/ipsec (100%)
 rename {contrib => completions}/iptables (100%)
 rename {contrib => completions}/ipv6calc (100%)
 rename {contrib => completions}/isql (100%)
 rename {contrib => completions}/jar (100%)
 rename {contrib => completions}/java (100%)
 rename {contrib => completions}/k3b (100%)
 rename {contrib => completions}/kldload (100%)
 rename {contrib => completions}/larch (100%)
 rename {contrib => completions}/ldapvi (100%)
 rename {contrib => completions}/lftp (100%)
 rename {contrib => completions}/lilo (100%)
 rename {contrib => completions}/links (100%)
 rename {contrib => completions}/lintian (100%)
 rename {contrib => completions}/lisp (100%)
 rename {contrib => completions}/lrzip (100%)
 rename {contrib => completions}/lvm (100%)
 rename {contrib => completions}/lzma (100%)
 rename {contrib => completions}/lzop (100%)
 rename {contrib => completions}/mailman (100%)
 rename {contrib => completions}/make (100%)
 rename {contrib => completions}/man (100%)
 rename {contrib => completions}/mc (100%)
 rename {contrib => completions}/mcrypt (100%)
 rename {contrib => completions}/mdadm (100%)
 rename {contrib => completions}/medusa (100%)
 rename {contrib => completions}/minicom (100%)
 rename {contrib => completions}/mkinitrd (100%)
 rename {contrib => completions}/module-init-tools (100%)
 rename {contrib => completions}/monodevelop (100%)
 rename {contrib => completions}/mount (100%)
 rename {contrib => completions}/mplayer (100%)
 rename {contrib => completions}/msynctool (100%)
 rename {contrib => completions}/mtx (100%)
 rename {contrib => completions}/munin-node (100%)
 rename {contrib => completions}/mutt (100%)
 rename {contrib => completions}/mysqladmin (100%)
 rename {contrib => completions}/ncftp (100%)
 rename {contrib => completions}/net-tools (100%)
 rename {contrib => completions}/nmap (100%)
 rename {contrib => completions}/ntpdate (100%)
 rename {contrib => completions}/openldap (100%)
 rename {contrib => completions}/openssl (100%)
 rename {contrib => completions}/p4 (100%)
 rename {contrib => completions}/perl (100%)
 rename {contrib => completions}/pine (100%)
 rename {contrib => completions}/pkg-config (100%)
 rename {contrib => completions}/pkg_install (100%)
 rename {contrib => completions}/pkgtools (100%)
 rename {contrib => completions}/pm-utils (100%)
 rename {contrib => completions}/portupgrade (100%)
 rename {contrib => completions}/postfix (100%)
 rename {contrib => completions}/postgresql (100%)
 rename {contrib => completions}/povray (100%)
 rename {contrib => completions}/procps (100%)
 rename {contrib => completions}/python (100%)
 rename {contrib => completions}/qdbus (100%)
 rename {contrib => completions}/qemu (100%)
 rename {contrib => completions}/quota-tools (100%)
 rename {contrib => completions}/rcs (100%)
 rename {contrib => completions}/rdesktop (100%)
 rename {contrib => completions}/reportbug (100%)
 rename {contrib => completions}/resolvconf (100%)
 rename {contrib => completions}/rfkill (100%)
 rename {contrib => completions}/ri (100%)
 rename {contrib => completions}/rpcdebug (100%)
 rename {contrib => completions}/rpm (100%)
 rename {contrib => completions}/rpmcheck (100%)
 rename {contrib => completions}/rrdtool (100%)
 rename {contrib => completions}/rsync (100%)
 rename {contrib => completions}/rtcwake (100%)
 rename {contrib => completions}/samba (100%)
 rename {contrib => completions}/sbcl (100%)
 rename {contrib => completions}/screen (100%)
 rename {contrib => completions}/service (100%)
 rename {contrib => completions}/sh (100%)
 rename {contrib => completions}/shadow (100%)
 rename {contrib => completions}/sitecopy (100%)
 rename {contrib => completions}/smartctl (100%)
 rename {contrib => completions}/snownews (100%)
 rename {contrib => completions}/sqlite3 (100%)
 rename {contrib => completions}/ssh (100%)
 rename {contrib => completions}/sshfs (100%)
 rename {contrib => completions}/strace (100%)
 rename {contrib => completions}/svk (100%)
 rename {contrib => completions}/sysctl (100%)
 rename {contrib => completions}/sysv-rc (100%)
 rename {contrib => completions}/tar (100%)
 rename {contrib => completions}/tcpdump (100%)
 rename {contrib => completions}/unace (100%)
 rename {contrib => completions}/unrar (100%)
 rename {contrib => completions}/update-alternatives (100%)
 rename {contrib => completions}/util-linux (100%)
 rename {contrib => completions}/vncviewer (100%)
 rename {contrib => completions}/vpnc (100%)
 rename {contrib => completions}/wireless-tools (100%)
 rename {contrib => completions}/wodim (100%)
 rename {contrib => completions}/wol (100%)
 rename {contrib => completions}/wtf (100%)
 rename {contrib => completions}/wvdial (100%)
 rename {contrib => completions}/xhost (100%)
 rename {contrib => completions}/xm (100%)
 rename {contrib => completions}/xmllint (100%)
 rename {contrib => completions}/xmlwf (100%)
 rename {contrib => completions}/xmms (100%)
 rename {contrib => completions}/xrandr (100%)
 rename {contrib => completions}/xsltproc (100%)
 rename {contrib => completions}/xz (100%)
 rename {contrib => completions}/yp-tools (100%)
 rename {contrib => completions}/yum-arch (100%)

diff --git a/Makefile.am b/Makefile.am
index df2140af..94016028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = contrib helpers test
+SUBDIRS = completions helpers test
 
 sysconf_DATA = bash_completion
 
diff --git a/contrib/Makefile.am b/completions/Makefile.am
similarity index 100%
rename from contrib/Makefile.am
rename to completions/Makefile.am
diff --git a/contrib/_mock b/completions/_mock
similarity index 100%
rename from contrib/_mock
rename to completions/_mock
diff --git a/contrib/_modules b/completions/_modules
similarity index 100%
rename from contrib/_modules
rename to completions/_modules
diff --git a/contrib/_subversion b/completions/_subversion
similarity index 100%
rename from contrib/_subversion
rename to completions/_subversion
diff --git a/contrib/_yum b/completions/_yum
similarity index 100%
rename from contrib/_yum
rename to completions/_yum
diff --git a/contrib/_yum-utils b/completions/_yum-utils
similarity index 100%
rename from contrib/_yum-utils
rename to completions/_yum-utils
diff --git a/contrib/abook b/completions/abook
similarity index 100%
rename from contrib/abook
rename to completions/abook
diff --git a/contrib/ant b/completions/ant
similarity index 100%
rename from contrib/ant
rename to completions/ant
diff --git a/contrib/apache2ctl b/completions/apache2ctl
similarity index 100%
rename from contrib/apache2ctl
rename to completions/apache2ctl
diff --git a/contrib/apt b/completions/apt
similarity index 100%
rename from contrib/apt
rename to completions/apt
diff --git a/contrib/apt-build b/completions/apt-build
similarity index 100%
rename from contrib/apt-build
rename to completions/apt-build
diff --git a/contrib/aptitude b/completions/aptitude
similarity index 100%
rename from contrib/aptitude
rename to completions/aptitude
diff --git a/contrib/aspell b/completions/aspell
similarity index 100%
rename from contrib/aspell
rename to completions/aspell
diff --git a/contrib/autorpm b/completions/autorpm
similarity index 100%
rename from contrib/autorpm
rename to completions/autorpm
diff --git a/contrib/bash-builtins b/completions/bash-builtins
similarity index 100%
rename from contrib/bash-builtins
rename to completions/bash-builtins
diff --git a/contrib/bind-utils b/completions/bind-utils
similarity index 100%
rename from contrib/bind-utils
rename to completions/bind-utils
diff --git a/contrib/bitkeeper b/completions/bitkeeper
similarity index 100%
rename from contrib/bitkeeper
rename to completions/bitkeeper
diff --git a/contrib/bittorrent b/completions/bittorrent
similarity index 100%
rename from contrib/bittorrent
rename to completions/bittorrent
diff --git a/contrib/bluez b/completions/bluez
similarity index 100%
rename from contrib/bluez
rename to completions/bluez
diff --git a/contrib/brctl b/completions/brctl
similarity index 100%
rename from contrib/brctl
rename to completions/brctl
diff --git a/contrib/bzip2 b/completions/bzip2
similarity index 100%
rename from contrib/bzip2
rename to completions/bzip2
diff --git a/contrib/cardctl b/completions/cardctl
similarity index 100%
rename from contrib/cardctl
rename to completions/cardctl
diff --git a/contrib/cfengine b/completions/cfengine
similarity index 100%
rename from contrib/cfengine
rename to completions/cfengine
diff --git a/contrib/chkconfig b/completions/chkconfig
similarity index 100%
rename from contrib/chkconfig
rename to completions/chkconfig
diff --git a/contrib/chsh b/completions/chsh
similarity index 100%
rename from contrib/chsh
rename to completions/chsh
diff --git a/contrib/cksfv b/completions/cksfv
similarity index 100%
rename from contrib/cksfv
rename to completions/cksfv
diff --git a/contrib/clisp b/completions/clisp
similarity index 100%
rename from contrib/clisp
rename to completions/clisp
diff --git a/contrib/configure b/completions/configure
similarity index 100%
rename from contrib/configure
rename to completions/configure
diff --git a/contrib/coreutils b/completions/coreutils
similarity index 100%
rename from contrib/coreutils
rename to completions/coreutils
diff --git a/contrib/cowsay b/completions/cowsay
similarity index 100%
rename from contrib/cowsay
rename to completions/cowsay
diff --git a/contrib/cpan2dist b/completions/cpan2dist
similarity index 100%
rename from contrib/cpan2dist
rename to completions/cpan2dist
diff --git a/contrib/cpio b/completions/cpio
similarity index 100%
rename from contrib/cpio
rename to completions/cpio
diff --git a/contrib/crontab b/completions/crontab
similarity index 100%
rename from contrib/crontab
rename to completions/crontab
diff --git a/contrib/cryptsetup b/completions/cryptsetup
similarity index 100%
rename from contrib/cryptsetup
rename to completions/cryptsetup
diff --git a/contrib/cups b/completions/cups
similarity index 100%
rename from contrib/cups
rename to completions/cups
diff --git a/contrib/cvs b/completions/cvs
similarity index 100%
rename from contrib/cvs
rename to completions/cvs
diff --git a/contrib/cvsps b/completions/cvsps
similarity index 100%
rename from contrib/cvsps
rename to completions/cvsps
diff --git a/contrib/dd b/completions/dd
similarity index 100%
rename from contrib/dd
rename to completions/dd
diff --git a/contrib/dhclient b/completions/dhclient
similarity index 100%
rename from contrib/dhclient
rename to completions/dhclient
diff --git a/contrib/dict b/completions/dict
similarity index 100%
rename from contrib/dict
rename to completions/dict
diff --git a/contrib/dpkg b/completions/dpkg
similarity index 100%
rename from contrib/dpkg
rename to completions/dpkg
diff --git a/contrib/dselect b/completions/dselect
similarity index 100%
rename from contrib/dselect
rename to completions/dselect
diff --git a/contrib/dsniff b/completions/dsniff
similarity index 100%
rename from contrib/dsniff
rename to completions/dsniff
diff --git a/contrib/findutils b/completions/findutils
similarity index 100%
rename from contrib/findutils
rename to completions/findutils
diff --git a/contrib/freeciv b/completions/freeciv
similarity index 100%
rename from contrib/freeciv
rename to completions/freeciv
diff --git a/contrib/freerdp b/completions/freerdp
similarity index 100%
rename from contrib/freerdp
rename to completions/freerdp
diff --git a/contrib/fuse b/completions/fuse
similarity index 100%
rename from contrib/fuse
rename to completions/fuse
diff --git a/contrib/gcc b/completions/gcc
similarity index 100%
rename from contrib/gcc
rename to completions/gcc
diff --git a/contrib/gcl b/completions/gcl
similarity index 100%
rename from contrib/gcl
rename to completions/gcl
diff --git a/contrib/gdb b/completions/gdb
similarity index 100%
rename from contrib/gdb
rename to completions/gdb
diff --git a/contrib/genisoimage b/completions/genisoimage
similarity index 100%
rename from contrib/genisoimage
rename to completions/genisoimage
diff --git a/contrib/getent b/completions/getent
similarity index 100%
rename from contrib/getent
rename to completions/getent
diff --git a/contrib/gkrellm b/completions/gkrellm
similarity index 100%
rename from contrib/gkrellm
rename to completions/gkrellm
diff --git a/contrib/gnatmake b/completions/gnatmake
similarity index 100%
rename from contrib/gnatmake
rename to completions/gnatmake
diff --git a/contrib/gpg b/completions/gpg
similarity index 100%
rename from contrib/gpg
rename to completions/gpg
diff --git a/contrib/gpg2 b/completions/gpg2
similarity index 100%
rename from contrib/gpg2
rename to completions/gpg2
diff --git a/contrib/gzip b/completions/gzip
similarity index 100%
rename from contrib/gzip
rename to completions/gzip
diff --git a/contrib/heimdal b/completions/heimdal
similarity index 100%
rename from contrib/heimdal
rename to completions/heimdal
diff --git a/contrib/hping2 b/completions/hping2
similarity index 100%
rename from contrib/hping2
rename to completions/hping2
diff --git a/contrib/iconv b/completions/iconv
similarity index 100%
rename from contrib/iconv
rename to completions/iconv
diff --git a/contrib/iftop b/completions/iftop
similarity index 100%
rename from contrib/iftop
rename to completions/iftop
diff --git a/contrib/ifupdown b/completions/ifupdown
similarity index 100%
rename from contrib/ifupdown
rename to completions/ifupdown
diff --git a/contrib/imagemagick b/completions/imagemagick
similarity index 100%
rename from contrib/imagemagick
rename to completions/imagemagick
diff --git a/contrib/info b/completions/info
similarity index 100%
rename from contrib/info
rename to completions/info
diff --git a/contrib/ipmitool b/completions/ipmitool
similarity index 100%
rename from contrib/ipmitool
rename to completions/ipmitool
diff --git a/contrib/ipsec b/completions/ipsec
similarity index 100%
rename from contrib/ipsec
rename to completions/ipsec
diff --git a/contrib/iptables b/completions/iptables
similarity index 100%
rename from contrib/iptables
rename to completions/iptables
diff --git a/contrib/ipv6calc b/completions/ipv6calc
similarity index 100%
rename from contrib/ipv6calc
rename to completions/ipv6calc
diff --git a/contrib/isql b/completions/isql
similarity index 100%
rename from contrib/isql
rename to completions/isql
diff --git a/contrib/jar b/completions/jar
similarity index 100%
rename from contrib/jar
rename to completions/jar
diff --git a/contrib/java b/completions/java
similarity index 100%
rename from contrib/java
rename to completions/java
diff --git a/contrib/k3b b/completions/k3b
similarity index 100%
rename from contrib/k3b
rename to completions/k3b
diff --git a/contrib/kldload b/completions/kldload
similarity index 100%
rename from contrib/kldload
rename to completions/kldload
diff --git a/contrib/larch b/completions/larch
similarity index 100%
rename from contrib/larch
rename to completions/larch
diff --git a/contrib/ldapvi b/completions/ldapvi
similarity index 100%
rename from contrib/ldapvi
rename to completions/ldapvi
diff --git a/contrib/lftp b/completions/lftp
similarity index 100%
rename from contrib/lftp
rename to completions/lftp
diff --git a/contrib/lilo b/completions/lilo
similarity index 100%
rename from contrib/lilo
rename to completions/lilo
diff --git a/contrib/links b/completions/links
similarity index 100%
rename from contrib/links
rename to completions/links
diff --git a/contrib/lintian b/completions/lintian
similarity index 100%
rename from contrib/lintian
rename to completions/lintian
diff --git a/contrib/lisp b/completions/lisp
similarity index 100%
rename from contrib/lisp
rename to completions/lisp
diff --git a/contrib/lrzip b/completions/lrzip
similarity index 100%
rename from contrib/lrzip
rename to completions/lrzip
diff --git a/contrib/lvm b/completions/lvm
similarity index 100%
rename from contrib/lvm
rename to completions/lvm
diff --git a/contrib/lzma b/completions/lzma
similarity index 100%
rename from contrib/lzma
rename to completions/lzma
diff --git a/contrib/lzop b/completions/lzop
similarity index 100%
rename from contrib/lzop
rename to completions/lzop
diff --git a/contrib/mailman b/completions/mailman
similarity index 100%
rename from contrib/mailman
rename to completions/mailman
diff --git a/contrib/make b/completions/make
similarity index 100%
rename from contrib/make
rename to completions/make
diff --git a/contrib/man b/completions/man
similarity index 100%
rename from contrib/man
rename to completions/man
diff --git a/contrib/mc b/completions/mc
similarity index 100%
rename from contrib/mc
rename to completions/mc
diff --git a/contrib/mcrypt b/completions/mcrypt
similarity index 100%
rename from contrib/mcrypt
rename to completions/mcrypt
diff --git a/contrib/mdadm b/completions/mdadm
similarity index 100%
rename from contrib/mdadm
rename to completions/mdadm
diff --git a/contrib/medusa b/completions/medusa
similarity index 100%
rename from contrib/medusa
rename to completions/medusa
diff --git a/contrib/minicom b/completions/minicom
similarity index 100%
rename from contrib/minicom
rename to completions/minicom
diff --git a/contrib/mkinitrd b/completions/mkinitrd
similarity index 100%
rename from contrib/mkinitrd
rename to completions/mkinitrd
diff --git a/contrib/module-init-tools b/completions/module-init-tools
similarity index 100%
rename from contrib/module-init-tools
rename to completions/module-init-tools
diff --git a/contrib/monodevelop b/completions/monodevelop
similarity index 100%
rename from contrib/monodevelop
rename to completions/monodevelop
diff --git a/contrib/mount b/completions/mount
similarity index 100%
rename from contrib/mount
rename to completions/mount
diff --git a/contrib/mplayer b/completions/mplayer
similarity index 100%
rename from contrib/mplayer
rename to completions/mplayer
diff --git a/contrib/msynctool b/completions/msynctool
similarity index 100%
rename from contrib/msynctool
rename to completions/msynctool
diff --git a/contrib/mtx b/completions/mtx
similarity index 100%
rename from contrib/mtx
rename to completions/mtx
diff --git a/contrib/munin-node b/completions/munin-node
similarity index 100%
rename from contrib/munin-node
rename to completions/munin-node
diff --git a/contrib/mutt b/completions/mutt
similarity index 100%
rename from contrib/mutt
rename to completions/mutt
diff --git a/contrib/mysqladmin b/completions/mysqladmin
similarity index 100%
rename from contrib/mysqladmin
rename to completions/mysqladmin
diff --git a/contrib/ncftp b/completions/ncftp
similarity index 100%
rename from contrib/ncftp
rename to completions/ncftp
diff --git a/contrib/net-tools b/completions/net-tools
similarity index 100%
rename from contrib/net-tools
rename to completions/net-tools
diff --git a/contrib/nmap b/completions/nmap
similarity index 100%
rename from contrib/nmap
rename to completions/nmap
diff --git a/contrib/ntpdate b/completions/ntpdate
similarity index 100%
rename from contrib/ntpdate
rename to completions/ntpdate
diff --git a/contrib/openldap b/completions/openldap
similarity index 100%
rename from contrib/openldap
rename to completions/openldap
diff --git a/contrib/openssl b/completions/openssl
similarity index 100%
rename from contrib/openssl
rename to completions/openssl
diff --git a/contrib/p4 b/completions/p4
similarity index 100%
rename from contrib/p4
rename to completions/p4
diff --git a/contrib/perl b/completions/perl
similarity index 100%
rename from contrib/perl
rename to completions/perl
diff --git a/contrib/pine b/completions/pine
similarity index 100%
rename from contrib/pine
rename to completions/pine
diff --git a/contrib/pkg-config b/completions/pkg-config
similarity index 100%
rename from contrib/pkg-config
rename to completions/pkg-config
diff --git a/contrib/pkg_install b/completions/pkg_install
similarity index 100%
rename from contrib/pkg_install
rename to completions/pkg_install
diff --git a/contrib/pkgtools b/completions/pkgtools
similarity index 100%
rename from contrib/pkgtools
rename to completions/pkgtools
diff --git a/contrib/pm-utils b/completions/pm-utils
similarity index 100%
rename from contrib/pm-utils
rename to completions/pm-utils
diff --git a/contrib/portupgrade b/completions/portupgrade
similarity index 100%
rename from contrib/portupgrade
rename to completions/portupgrade
diff --git a/contrib/postfix b/completions/postfix
similarity index 100%
rename from contrib/postfix
rename to completions/postfix
diff --git a/contrib/postgresql b/completions/postgresql
similarity index 100%
rename from contrib/postgresql
rename to completions/postgresql
diff --git a/contrib/povray b/completions/povray
similarity index 100%
rename from contrib/povray
rename to completions/povray
diff --git a/contrib/procps b/completions/procps
similarity index 100%
rename from contrib/procps
rename to completions/procps
diff --git a/contrib/python b/completions/python
similarity index 100%
rename from contrib/python
rename to completions/python
diff --git a/contrib/qdbus b/completions/qdbus
similarity index 100%
rename from contrib/qdbus
rename to completions/qdbus
diff --git a/contrib/qemu b/completions/qemu
similarity index 100%
rename from contrib/qemu
rename to completions/qemu
diff --git a/contrib/quota-tools b/completions/quota-tools
similarity index 100%
rename from contrib/quota-tools
rename to completions/quota-tools
diff --git a/contrib/rcs b/completions/rcs
similarity index 100%
rename from contrib/rcs
rename to completions/rcs
diff --git a/contrib/rdesktop b/completions/rdesktop
similarity index 100%
rename from contrib/rdesktop
rename to completions/rdesktop
diff --git a/contrib/reportbug b/completions/reportbug
similarity index 100%
rename from contrib/reportbug
rename to completions/reportbug
diff --git a/contrib/resolvconf b/completions/resolvconf
similarity index 100%
rename from contrib/resolvconf
rename to completions/resolvconf
diff --git a/contrib/rfkill b/completions/rfkill
similarity index 100%
rename from contrib/rfkill
rename to completions/rfkill
diff --git a/contrib/ri b/completions/ri
similarity index 100%
rename from contrib/ri
rename to completions/ri
diff --git a/contrib/rpcdebug b/completions/rpcdebug
similarity index 100%
rename from contrib/rpcdebug
rename to completions/rpcdebug
diff --git a/contrib/rpm b/completions/rpm
similarity index 100%
rename from contrib/rpm
rename to completions/rpm
diff --git a/contrib/rpmcheck b/completions/rpmcheck
similarity index 100%
rename from contrib/rpmcheck
rename to completions/rpmcheck
diff --git a/contrib/rrdtool b/completions/rrdtool
similarity index 100%
rename from contrib/rrdtool
rename to completions/rrdtool
diff --git a/contrib/rsync b/completions/rsync
similarity index 100%
rename from contrib/rsync
rename to completions/rsync
diff --git a/contrib/rtcwake b/completions/rtcwake
similarity index 100%
rename from contrib/rtcwake
rename to completions/rtcwake
diff --git a/contrib/samba b/completions/samba
similarity index 100%
rename from contrib/samba
rename to completions/samba
diff --git a/contrib/sbcl b/completions/sbcl
similarity index 100%
rename from contrib/sbcl
rename to completions/sbcl
diff --git a/contrib/screen b/completions/screen
similarity index 100%
rename from contrib/screen
rename to completions/screen
diff --git a/contrib/service b/completions/service
similarity index 100%
rename from contrib/service
rename to completions/service
diff --git a/contrib/sh b/completions/sh
similarity index 100%
rename from contrib/sh
rename to completions/sh
diff --git a/contrib/shadow b/completions/shadow
similarity index 100%
rename from contrib/shadow
rename to completions/shadow
diff --git a/contrib/sitecopy b/completions/sitecopy
similarity index 100%
rename from contrib/sitecopy
rename to completions/sitecopy
diff --git a/contrib/smartctl b/completions/smartctl
similarity index 100%
rename from contrib/smartctl
rename to completions/smartctl
diff --git a/contrib/snownews b/completions/snownews
similarity index 100%
rename from contrib/snownews
rename to completions/snownews
diff --git a/contrib/sqlite3 b/completions/sqlite3
similarity index 100%
rename from contrib/sqlite3
rename to completions/sqlite3
diff --git a/contrib/ssh b/completions/ssh
similarity index 100%
rename from contrib/ssh
rename to completions/ssh
diff --git a/contrib/sshfs b/completions/sshfs
similarity index 100%
rename from contrib/sshfs
rename to completions/sshfs
diff --git a/contrib/strace b/completions/strace
similarity index 100%
rename from contrib/strace
rename to completions/strace
diff --git a/contrib/svk b/completions/svk
similarity index 100%
rename from contrib/svk
rename to completions/svk
diff --git a/contrib/sysctl b/completions/sysctl
similarity index 100%
rename from contrib/sysctl
rename to completions/sysctl
diff --git a/contrib/sysv-rc b/completions/sysv-rc
similarity index 100%
rename from contrib/sysv-rc
rename to completions/sysv-rc
diff --git a/contrib/tar b/completions/tar
similarity index 100%
rename from contrib/tar
rename to completions/tar
diff --git a/contrib/tcpdump b/completions/tcpdump
similarity index 100%
rename from contrib/tcpdump
rename to completions/tcpdump
diff --git a/contrib/unace b/completions/unace
similarity index 100%
rename from contrib/unace
rename to completions/unace
diff --git a/contrib/unrar b/completions/unrar
similarity index 100%
rename from contrib/unrar
rename to completions/unrar
diff --git a/contrib/update-alternatives b/completions/update-alternatives
similarity index 100%
rename from contrib/update-alternatives
rename to completions/update-alternatives
diff --git a/contrib/util-linux b/completions/util-linux
similarity index 100%
rename from contrib/util-linux
rename to completions/util-linux
diff --git a/contrib/vncviewer b/completions/vncviewer
similarity index 100%
rename from contrib/vncviewer
rename to completions/vncviewer
diff --git a/contrib/vpnc b/completions/vpnc
similarity index 100%
rename from contrib/vpnc
rename to completions/vpnc
diff --git a/contrib/wireless-tools b/completions/wireless-tools
similarity index 100%
rename from contrib/wireless-tools
rename to completions/wireless-tools
diff --git a/contrib/wodim b/completions/wodim
similarity index 100%
rename from contrib/wodim
rename to completions/wodim
diff --git a/contrib/wol b/completions/wol
similarity index 100%
rename from contrib/wol
rename to completions/wol
diff --git a/contrib/wtf b/completions/wtf
similarity index 100%
rename from contrib/wtf
rename to completions/wtf
diff --git a/contrib/wvdial b/completions/wvdial
similarity index 100%
rename from contrib/wvdial
rename to completions/wvdial
diff --git a/contrib/xhost b/completions/xhost
similarity index 100%
rename from contrib/xhost
rename to completions/xhost
diff --git a/contrib/xm b/completions/xm
similarity index 100%
rename from contrib/xm
rename to completions/xm
diff --git a/contrib/xmllint b/completions/xmllint
similarity index 100%
rename from contrib/xmllint
rename to completions/xmllint
diff --git a/contrib/xmlwf b/completions/xmlwf
similarity index 100%
rename from contrib/xmlwf
rename to completions/xmlwf
diff --git a/contrib/xmms b/completions/xmms
similarity index 100%
rename from contrib/xmms
rename to completions/xmms
diff --git a/contrib/xrandr b/completions/xrandr
similarity index 100%
rename from contrib/xrandr
rename to completions/xrandr
diff --git a/contrib/xsltproc b/completions/xsltproc
similarity index 100%
rename from contrib/xsltproc
rename to completions/xsltproc
diff --git a/contrib/xz b/completions/xz
similarity index 100%
rename from contrib/xz
rename to completions/xz
diff --git a/contrib/yp-tools b/completions/yp-tools
similarity index 100%
rename from contrib/yp-tools
rename to completions/yp-tools
diff --git a/contrib/yum-arch b/completions/yum-arch
similarity index 100%
rename from contrib/yum-arch
rename to completions/yum-arch
diff --git a/configure.ac b/configure.ac
index 1879a51e..8cb69952 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,5 +3,5 @@ AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
-AC_CONFIG_FILES([Makefile contrib/Makefile helpers/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
 AC_OUTPUT

From 796f77ef22ec484b4814af92223b6fc0e108c132 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 12 Sep 2010 16:44:39 +0200
Subject: [PATCH 052/214] rename 'contrib' directory to 'completions'

---
 test/lib/library.exp | 2 +-
 test/runLint         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index a79ec526..eaafcbc4 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -698,7 +698,7 @@ proc _save_env {{file ""}} {
 
 # Source bash_completion package
 proc source_bash_completion {} {
-    assert_bash_exec {BASH_COMPLETION_DIR=$(cd "$TESTDIR/.."; pwd)/contrib}
+    assert_bash_exec {BASH_COMPLETION_DIR=$(cd "$TESTDIR/.."; pwd)/completions}
     assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
     assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
     assert_bash_exec {source "$BASH_COMPLETION"}
diff --git a/test/runLint b/test/runLint
index b2bf005c..88c717a2 100755
--- a/test/runLint
+++ b/test/runLint
@@ -3,7 +3,7 @@
 gitgrep()
 {
     local out=$(git grep -I -E -n "$1" | \
-        grep -E '^(bash_completion|contrib/|test/)' | \
+        grep -E '^(bash_completion|completions/|test/)' | \
         grep -Fv 'test/runLint')
     if [ -n "$out" ] ; then
         printf '***** %s\n' "$2"

From 0f426b077450c58d9cc187460eb1b9f727d8e9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 13 Sep 2010 21:25:21 +0300
Subject: [PATCH 053/214] Drop bad kompare filename completion (Alioth:
 #312708).

---
 CHANGES         | 1 +
 bash_completion | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a2a317a5..65102c24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ bash-completion (2.x)
   * Recognize rpm query mode based on the --file, --group, --package, and
     --all long options (RedHat: #630328).
   * Improve rpm query option completions.
+  * Drop bad kompare filename completion (Alioth: #312708).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index eabb38d6..d423753e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -121,7 +121,6 @@ complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
 complete -f -X '!*.[Hh][Rr][Bb]' hbrun
 complete -f -X '!*.ly' lilypond ly2dvi
 complete -f -X '!*.@(dif?(f)|?(d)patch)?(.@([gx]z|bz2|lzma))' cdiff
-complete -f -X '!*.@(dif?(f)|?(d)patch)' kompare
 complete -f -X '!*.lyx' lyx
 # FINISH exclude -- do not remove this line
 

From 3b7ed984597d0b5a8e7234a3a1084370353a425c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 14 Sep 2010 21:00:31 +0300
Subject: [PATCH 054/214] Add xmodmap and xrdb completions.

---
 CHANGES                          |  2 +-
 completions/Makefile.am          |  2 ++
 completions/xmodmap              | 32 +++++++++++++++++++++++++++
 completions/xrdb                 | 37 ++++++++++++++++++++++++++++++++
 test/completion/xmodmap.exp      |  1 +
 test/completion/xrdb.exp         |  1 +
 test/lib/completions/xmodmap.exp | 20 +++++++++++++++++
 test/lib/completions/xrdb.exp    | 20 +++++++++++++++++
 8 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 completions/xmodmap
 create mode 100644 completions/xrdb
 create mode 100644 test/completion/xmodmap.exp
 create mode 100644 test/completion/xrdb.exp
 create mode 100644 test/lib/completions/xmodmap.exp
 create mode 100644 test/lib/completions/xrdb.exp

diff --git a/CHANGES b/CHANGES
index 65102c24..0e254a2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab, iftop, lrzip, and POSIX sh completions.
+  * Add crontab, iftop, lrzip, POSIX sh, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 86f62251..ffd3fdee 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -162,7 +162,9 @@ bashcomp_DATA = abook \
 		xmllint \
 		xmlwf \
 		xmms \
+		xmodmap \
 		xrandr \
+		xrdb \
 		xsltproc \
 		xz \
 		yp-tools \
diff --git a/completions/xmodmap b/completions/xmodmap
new file mode 100644
index 00000000..f4f29150
--- /dev/null
+++ b/completions/xmodmap
@@ -0,0 +1,32 @@
+# xmodmap(1) completion
+
+have xmodmap &&
+_xmodmap()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -display|-e)
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-display -help -grammar -verbose -quiet -n
+            -e -pm -pk -pke -pp' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _xmodmap -o filenames xmodmap
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/xrdb b/completions/xrdb
new file mode 100644
index 00000000..423c0927
--- /dev/null
+++ b/completions/xrdb
@@ -0,0 +1,37 @@
+# xrdb(1) completion
+
+have xrdb &&
+_xrdb()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -backup|-display|-help)
+            return 0
+            ;;
+        -cpp|-edit)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-help -display -all -global -screen -screens
+            -n -quiet -cpp -nocpp -symbols -query -load -override -merge
+            -remove -retain -edit -backup' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _xrdb -o filenames xrdb
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/xmodmap.exp b/test/completion/xmodmap.exp
new file mode 100644
index 00000000..a80bb027
--- /dev/null
+++ b/test/completion/xmodmap.exp
@@ -0,0 +1 @@
+assert_source_completions xmodmap
diff --git a/test/completion/xrdb.exp b/test/completion/xrdb.exp
new file mode 100644
index 00000000..522ac311
--- /dev/null
+++ b/test/completion/xrdb.exp
@@ -0,0 +1 @@
+assert_source_completions xrdb
diff --git a/test/lib/completions/xmodmap.exp b/test/lib/completions/xmodmap.exp
new file mode 100644
index 00000000..2bf4da1c
--- /dev/null
+++ b/test/lib/completions/xmodmap.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xmodmap "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/xrdb.exp b/test/lib/completions/xrdb.exp
new file mode 100644
index 00000000..f02625dc
--- /dev/null
+++ b/test/lib/completions/xrdb.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xrdb "
+
+
+sync_after_int
+
+
+teardown

From 806bc113dec88f358014cb3967927e57449bde79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 14 Sep 2010 21:03:00 +0300
Subject: [PATCH 055/214] Line wrapping tweak.

---
 completions/bash-builtins | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/completions/bash-builtins b/completions/bash-builtins
index aac75ae0..75ee1f5e 100644
--- a/completions/bash-builtins
+++ b/completions/bash-builtins
@@ -85,10 +85,9 @@ _complete()
             ;;
 
         -A)
-            COMPREPLY=( $( compgen -W 'alias arrayvar binding \
-                builtin command directory disabled enabled \
-                export file function group helptopic hostname \
-                job keyword running service setopt shopt \
+            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
             ;;

From 45668c23d37f6dfbf8771866c2a6f85ba3e45e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 14 Sep 2010 21:04:36 +0300
Subject: [PATCH 056/214] Add compgen completion.

---
 CHANGES                   | 3 ++-
 completions/bash-builtins | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0e254a2f..46b7ceb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,8 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab, iftop, lrzip, POSIX sh, xmodmap, and xrdb completions.
+  * Add compgen, crontab, iftop, lrzip, POSIX sh, xmodmap, and xrdb
+    completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/bash-builtins b/completions/bash-builtins
index 75ee1f5e..3eba8a11 100644
--- a/completions/bash-builtins
+++ b/completions/bash-builtins
@@ -110,13 +110,14 @@ _complete()
 
     if [[ "$cur" == -* ]]; then
         # relevant options completion
-        COMPREPLY=( $( compgen -W '-a -b -c -d -e -f -g -j -k -o -s -v -u -A \
-            -G -W -P -S -X -F -C' -- "$cur" ) )
+        local opts="-a -b -c -d -e -f -g -j -k -o -s -u -v -A -G -W -P -S -X"
+        [[ $1 != compgen ]] && opts="$opts -F -C"
+        COMPREPLY=( $( compgen -W "$opts" -- "$cur" ) )
     else
         COMPREPLY=( $( compgen -A command -- "$cur" ) )
     fi
 }
-complete -F _complete complete
+complete -F _complete compgen complete
 
 # Local variables:
 # mode: shell-script

From d2a551fad4e75452b3ba2fcd6f4cce3117af3fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Sep 2010 20:51:51 +0300
Subject: [PATCH 057/214] Combine identical xdvi and kdvi completions.

---
 bash_completion | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index d423753e..22c33143 100644
--- a/bash_completion
+++ b/bash_completion
@@ -82,8 +82,7 @@ complete -f -X '!*.lrz' lrunzip
 complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' ee
 complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm|GIF|JPG|JP?(E)G|TIF?(F)|PNG|P[BGP]M|BMP|X[BP]M|RLE|RGB|PCX|FITS|PM)' xv qiv
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
-complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi
-complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' kdvi
+complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
 complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
 complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf
 complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' kpdf

From 8e23895fe5683417717c2461443a378e418ce1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 11:33:52 +0300
Subject: [PATCH 058/214] Avoid stderr output from compopt when invoking
 _filedir directly.

The _filedir unit test currently does this, causing (harmless) error output.
---
 bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index 22c33143..e6edf87b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -640,7 +640,7 @@ _filedir()
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
         if [ ${#toks[@]} -ne 0 ]; then
             # If `compopt' is available, set `-o filenames'
-            type compopt &>/dev/null && compopt -o filenames ||
+            type compopt &>/dev/null && compopt -o filenames 2>/dev/null ||
             # No, `compopt' isn't available;
             # Is `-o filenames' set?
             [[ (

From d0bcb5347e5269437205a8a7310363db6a1d94b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 11:46:20 +0300
Subject: [PATCH 059/214] Don't complete jar and povray on filenames ending
 with a dot.

---
 CHANGES            | 2 +-
 completions/jar    | 2 +-
 completions/povray | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 46b7ceb2..e1225767 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,7 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/* and sqlite3 completions.
+  * Improve /etc/init.d/*, jar, povray, and sqlite3 completions.
   * Fix p4 completion (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/jar b/completions/jar
index 75dcaf3e..2969ce0f 100644
--- a/completions/jar
+++ b/completions/jar
@@ -18,7 +18,7 @@ _jar()
             _filedir
             ;;
         *f)
-            _filedir '?([ejw]ar|zip|[EJW]AR|ZIP)'
+            _filedir '@([ejw]ar|zip|[EJW]AR|ZIP)'
             ;;
         *)
             _filedir
diff --git a/completions/povray b/completions/povray
index cd03b940..91602c7c 100644
--- a/completions/povray
+++ b/completions/povray
@@ -49,7 +49,7 @@ _povray()
             ;;
         *)
             cur="$povcur"
-            _filedir '?(ini|pov)'
+            _filedir '@(ini|pov)'
             return 0
             ;;
     esac

From c183a585b279dc29fcd8c5f18b9bab135cbdd358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 12:06:53 +0300
Subject: [PATCH 060/214] Match uppercased versions of _filedir and
 _filedir_xspec arguments too.

This provides a bit of case insensivity to file extension matching,
allowing for example _filedir foo to match both *.foo and *.FOO.  Note
that this is not real case insensivity; mixed case extensions like
*.FOO.gz are not matched by _filedir foo.gz so those need to be
handled like before this change.
---
 CHANGES                          |  2 ++
 bash_completion                  | 21 ++++++++++++++++++---
 test/fixtures/_filedir/ext/ii.E1 |  0
 test/unit/_filedir.exp           |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/_filedir/ext/ii.E1

diff --git a/CHANGES b/CHANGES
index e1225767..ffe2d80e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,8 @@ bash-completion (2.x)
     --all long options (RedHat: #630328).
   * Improve rpm query option completions.
   * Drop bad kompare filename completion (Alioth: #312708).
+  * Make _filedir and _filedir_xspec complete uppercase versions of their
+    filename extension arguments in addition to exact case matches.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index e6edf87b..2e56704a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -610,7 +610,8 @@ _quote_readline_by_ref()
 # This function performs file and directory completion. It's better than
 # simply using 'compgen -f', because it honours spaces in filenames.
 # @param $1  If `-d', complete only on directories.  Otherwise filter/pick only
-#            completions with `.$1' as file extension.
+#            completions with `.$1' and the uppercase version of it as file
+#            extension.
 #
 _filedir()
 {
@@ -636,7 +637,10 @@ _filedir()
     ))
 
     if [[ "$1" != -d ]]; then
-        xspec=${1:+"!*.$1"}
+        # Munge xspec to contain uppercase version too
+        [[ ${BASH_VERSINFO[0]} -ge 4 ]] && \
+            xspec=${1:+"!*.@($1|${1^^})"} || \
+            xspec=${1:+"!*.@($1|$(printf %s $1 | tr '[:lower:]' '[:upper:]'))"}
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
         if [ ${#toks[@]} -ne 0 ]; then
             # If `compopt' is available, set `-o filenames'
@@ -1586,8 +1590,19 @@ _filedir_xspec()
         }
         ))
 
+    # Munge xspec to contain uppercase version too
+    eval xspec="${xspec}"
+    local matchop=!
+    if [[ $xspec == !* ]]; then
+        xspec=${xspec#!}
+        matchop=@
+    fi
+    [[ ${BASH_VERSINFO[0]} -ge 4 ]] && \
+        xspec="$matchop($xspec|${xspec^^})" || \
+        xspec="$matchop($xspec|$(printf %s $xspec | tr '[:lower:]' '[:upper:]'))"
+
     toks=( ${toks[@]-} $(
-        eval compgen -f -X "$xspec" -- "\$(quote_readline "\$cur")" | {
+        eval compgen -f -X "!$xspec" -- "\$(quote_readline "\$cur")" | {
         while read -r tmp; do
             [ -n $tmp ] && printf '%s\n' $tmp
         done
diff --git a/test/fixtures/_filedir/ext/ii.E1 b/test/fixtures/_filedir/ext/ii.E1
new file mode 100644
index 00000000..e69de29b
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index 204d31cf..59d50854 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -242,7 +242,7 @@ foreach name {f f2} {
 
 
 set test "completing with filter '.e1' should show completions"
-assert_complete_dir {ee.e1 foo/ gg.e1} "g " "fixtures/_filedir/ext" $test
+assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "fixtures/_filedir/ext" $test
 
 
 sync_after_int

From 7ea7d7b2686a1c37d4b43c81b42e07054ae34acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 12:29:29 +0300
Subject: [PATCH 061/214] Simplify filename completions per new
 _filedir(_xspec) uppercasing behavior.

---
 bash_completion     | 34 +++++++++++++++++-----------------
 completions/jar     |  2 +-
 completions/mplayer | 10 +++++-----
 completions/unace   |  2 +-
 completions/unrar   |  2 +-
 completions/xmms    |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/bash_completion b/bash_completion
index 2e56704a..f7e1a281 100644
--- a/bash_completion
+++ b/bash_completion
@@ -70,7 +70,7 @@ complete -d pushd
 # START exclude -- do NOT remove this line
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
 complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
-complete -f -X '!*.@(zip|ZIP|[ejw]ar|[EJW]AR|exe|EXE|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub)' unzip zipinfo
+complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub)' unzip zipinfo
 complete -f -X '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
 complete -f -X '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
@@ -79,32 +79,32 @@ complete -f -X '!*.Z' uncompress
 complete -f -X '!*.@(tlz|lzma)' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
 complete -f -X '!*.@(?(t)xz|tlz|lzma)' unxz xzcat
 complete -f -X '!*.lrz' lrunzip
-complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' ee
-complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm|GIF|JPG|JP?(E)G|TIF?(F)|PNG|P[BGP]M|BMP|X[BP]M|RLE|RGB|PCX|FITS|PM)' xv qiv
+complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx)' ee
+complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm)' xv qiv
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
 complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
-complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
-complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf
-complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' kpdf
-complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|fdf|FDF)' evince
+complete -f -X '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
+complete -f -X '!*.pdf' acroread gpdf xpdf
+complete -f -X '!*.@(?(e)ps|pdf)' kpdf
+complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
 complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb|FB|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
-complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
+complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
 complete -f -X '!*.texi*' makeinfo texi2html
-complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS|ltx|LTX)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
-complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay
+complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
+complete -f -X '!*.mp3' mpg123 mpg321 madplay
 complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine kaffeine dragon
 complete -f -X '!*.@(avi|asf|wmv)' aviplay
 complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
-complete -f -X '!*.@(ogg|OGG|m3u|flac|spx)' ogg123
-complete -f -X '!*.@(mp3|MP3|ogg|OGG|pls|m3u)' gqmpeg freeamp
+complete -f -X '!*.@(ogg|m3u|flac|spx)' ogg123
+complete -f -X '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
 complete -f -X '!*.fig' xfig
-complete -f -X '!*.@(mid?(i)|MID?(I)|cmf|CMF)' playmidi
-complete -f -X '!*.@(mid?(i)|MID?(I)|rmi|RMI|rcp|RCP|[gr]36|[GR]36|g18|G18|mod|MOD|xm|XM|it|IT|x3m|X3M|s[3t]m|S[3T]M|kar|KAR)' timidity
-complete -f -X '!*.@(m[eo]d|M[EO]D|s[3t]m|S[3T]M|xm|XM|it|IT)' modplugplay modplug123
-complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
+complete -f -X '!*.@(mid?(i)|cmf)' playmidi
+complete -f -X '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
+complete -f -X '!*.@(m[eo]d|s[3t]m|xm|it)' modplugplay modplug123
+complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
 complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
-complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme
+complete -f -X '!*.@(zip|z|gz|tgz)' bzme
 # konqueror not here on purpose, it's more than a web/html browser
 complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
 complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|odt|ott|odm)' oowriter
diff --git a/completions/jar b/completions/jar
index 2969ce0f..6abfff3d 100644
--- a/completions/jar
+++ b/completions/jar
@@ -18,7 +18,7 @@ _jar()
             _filedir
             ;;
         *f)
-            _filedir '@([ejw]ar|zip|[EJW]AR|ZIP)'
+            _filedir '@([ejw]ar|zip)'
             ;;
         *)
             _filedir
diff --git a/completions/mplayer b/completions/mplayer
index ad458eba..7e4c5572 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -23,7 +23,7 @@ _mplayer()
             return 0
             ;;
         -audiofile)
-            _filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|w?(a)v|W?(A)V|mid|MID|flac|FLAC|mka|MKA|ape|APE)'
+            _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)'
             return 0
             ;;
         -font)
@@ -31,11 +31,11 @@ _mplayer()
             return 0
             ;;
         -sub)
-            _filedir '@(srt|SRT|sub|SUB|txt|TXT|utf|UTF|rar|RAR|mpsub|smi|js|ssa|SSA|ass|ASS)'
+            _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return 0
             ;;
         -vobsub)
-            _filedir '@(idx|IDX|ifo|IFO|sub|SUB)'
+            _filedir '@(idx|ifo|sub)'
             IFS=$'\t\n'
             COMPREPLY=( $( for i in "${COMPREPLY[@]}"; do
                         if [[ -f $i && -r $i ]]; then
@@ -48,11 +48,11 @@ _mplayer()
             return 0
             ;;
         -ifo)
-            _filedir '@(ifo|IFO)'
+            _filedir ifo
             return 0
             ;;
         -cuefile)
-            _filedir '@(bin|BIN|cue|CUE)'
+            _filedir '@(bin|cue)'
             return 0
             ;;
         -skin)
diff --git a/completions/unace b/completions/unace
index 5ceb7646..73d635d5 100644
--- a/completions/unace
+++ b/completions/unace
@@ -14,7 +14,7 @@ _unace()
         if [ $COMP_CWORD -eq 1 ]; then
             COMPREPLY=( $( compgen -W 'e l t v x' -- "$cur" ) )
         else
-            _filedir '@(ace|ACE)'
+            _filedir ace
         fi
     fi
 } &&
diff --git a/completions/unrar b/completions/unrar
index 3fb24dbb..0f5f7094 100644
--- a/completions/unrar
+++ b/completions/unrar
@@ -16,7 +16,7 @@ _unrar()
         if [ $COMP_CWORD -eq 1 ]; then
             COMPREPLY=( $( compgen -W 'e l lb lt p t v vb vt x' -- "$cur" ) )
         else
-            _filedir '@(rar|RAR)'
+            _filedir rar
         fi
     fi
 
diff --git a/completions/xmms b/completions/xmms
index 42c5402c..91b9ff5c 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -14,7 +14,7 @@ _xmms()
             --enqueue -m --show-main-window -i --sm-client-id \
             -v --version' -- "$cur" ) )
     else
-        _filedir '@(mp[23]|MP[23]|ogg|OGG|wav|WAV|pls|m3u|xm|mod|s[3t]m|it|mtm|ult|flac)'
+        _filedir '@(mp[23]|ogg|wav|pls|m3u|xm|mod|s[3t]m|it|mtm|ult|flac)'
 
     fi
 

From 5bcf5bae41b30d54662ae3fa7005f95c4048259c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 12:39:53 +0300
Subject: [PATCH 062/214] Fix povray completion, broken in
 f8bafe285e7d20fdd82f77289059dd18f78312c2.

---
 CHANGES            | 2 +-
 completions/povray | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index ffe2d80e..5418c02a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,7 +14,7 @@ bash-completion (2.x)
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, jar, povray, and sqlite3 completions.
-  * Fix p4 completion (Alioth: #312625).
+  * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
     --all long options (RedHat: #630328).
diff --git a/completions/povray b/completions/povray
index 91602c7c..7abc497a 100644
--- a/completions/povray
+++ b/completions/povray
@@ -7,7 +7,7 @@ _povray()
     defoext=png # default output extension, if cannot be determined FIXME
 
     COMPREPLY=()
-    _get_comp_words_by_ref povcur prev
+    _get_comp_words_by_ref -c povcur prev
 
     _expand || return 0
 

From b822b7cceb6540a97a96953eb4722a7c892a3004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 13:15:07 +0300
Subject: [PATCH 063/214] Indentation fix.

---
 completions/tar | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/completions/tar b/completions/tar
index 400daa62..81ecbce0 100644
--- a/completions/tar
+++ b/completions/tar
@@ -14,31 +14,30 @@ _tar()
     fi
 
     case ${COMP_WORDS[1]} in
-    ?(-)[cr]*f)
-        _filedir
-        return 0
-        ;;
-    +([^IZzJjy])f)
-        ext='t@(ar?(.@(Z|gz|bz?(2)|lz?(ma)|xz))|gz|bz?(2)|lz?(ma)|xz)'
-        regex='t\(ar\(\.\(Z\|gz\|bz2\?\|lzma\|xz\)\)\?\|gz\|bz2\?\|lzma\|xz\)'
-        ;;
-    *[Zz]*f)
-        ext='t?(ar.)@(gz|Z)'
-        regex='t\(ar\.\)\?\(gz\|Z\)'
-        ;;
-    *[Ijy]*f)
-        ext='t?(ar.)bz?(2)'
-        regex='t\(ar\.\)\?bz2\?'
-        ;;
-    *[J]*f)
-        ext='t?(ar.)@(lz?(ma)|xz)'
-        regex='t\(ar\.\)\?\(lzma\|xz\)\?'
-        ;;
-    *)
-        _filedir
-        return 0
-        ;;
-
+        ?(-)[cr]*f)
+            _filedir
+            return 0
+            ;;
+        +([^IZzJjy])f)
+            ext='t@(ar?(.@(Z|gz|bz?(2)|lz?(ma)|xz))|gz|bz?(2)|lz?(ma)|xz)'
+            regex='t\(ar\(\.\(Z\|gz\|bz2\?\|lzma\|xz\)\)\?\|gz\|bz2\?\|lzma\|xz\)'
+            ;;
+        *[Zz]*f)
+            ext='t?(ar.)@(gz|Z)'
+            regex='t\(ar\.\)\?\(gz\|Z\)'
+            ;;
+        *[Ijy]*f)
+            ext='t?(ar.)bz?(2)'
+            regex='t\(ar\.\)\?bz2\?'
+            ;;
+        *[J]*f)
+            ext='t?(ar.)@(lz?(ma)|xz)'
+            regex='t\(ar\.\)\?\(lzma\|xz\)\?'
+            ;;
+        *)
+            _filedir
+            return 0
+            ;;
     esac
 
     if [[ "$COMP_LINE" == *$ext' ' ]]; then

From 0ed0de30473e1ed2bd047ca864b56d99b44fa8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 14:33:09 +0300
Subject: [PATCH 064/214] Add badblocks, dumpe2fs, e2freefrag, e2label,
 filefrag, and tune2fs completions.

---
 CHANGES                             |   4 +-
 completions/Makefile.am             |   1 +
 completions/e2fsprogs               | 179 ++++++++++++++++++++++++++++
 test/completion/badblocks.exp       |   1 +
 test/completion/dumpe2fs.exp        |   1 +
 test/completion/e2freefrag.exp      |   1 +
 test/completion/e2label.exp         |   1 +
 test/completion/filefrag.exp        |   1 +
 test/completion/tune2fs.exp         |   1 +
 test/lib/completions/badblocks.exp  |  20 ++++
 test/lib/completions/dumpe2fs.exp   |  20 ++++
 test/lib/completions/e2freefrag.exp |  20 ++++
 test/lib/completions/e2label.exp    |  20 ++++
 test/lib/completions/filefrag.exp   |  20 ++++
 test/lib/completions/tune2fs.exp    |  20 ++++
 15 files changed, 308 insertions(+), 2 deletions(-)
 create mode 100644 completions/e2fsprogs
 create mode 100644 test/completion/badblocks.exp
 create mode 100644 test/completion/dumpe2fs.exp
 create mode 100644 test/completion/e2freefrag.exp
 create mode 100644 test/completion/e2label.exp
 create mode 100644 test/completion/filefrag.exp
 create mode 100644 test/completion/tune2fs.exp
 create mode 100644 test/lib/completions/badblocks.exp
 create mode 100644 test/lib/completions/dumpe2fs.exp
 create mode 100644 test/lib/completions/e2freefrag.exp
 create mode 100644 test/lib/completions/e2label.exp
 create mode 100644 test/lib/completions/filefrag.exp
 create mode 100644 test/lib/completions/tune2fs.exp

diff --git a/CHANGES b/CHANGES
index 5418c02a..f272503e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add compgen, crontab, iftop, lrzip, POSIX sh, xmodmap, and xrdb
-    completions.
+  * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, filefrag,
+    iftop, lrzip, POSIX sh, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index ffd3fdee..f335b5d0 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -35,6 +35,7 @@ bashcomp_DATA = abook \
 		dpkg \
 		dselect \
 		dsniff \
+		e2fsprogs \
 		findutils \
 		freeciv \
 		freerdp \
diff --git a/completions/e2fsprogs b/completions/e2fsprogs
new file mode 100644
index 00000000..1a240f1b
--- /dev/null
+++ b/completions/e2fsprogs
@@ -0,0 +1,179 @@
+# bash completion for e2fsprogs
+
+have badblocks &&
+_badblocks()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -b|-c|-e|-d|-p|-t)
+            return 0
+            ;;
+        -i|-o)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        # -w (dangerous) and -X (internal use) not here on purpose
+        COMPREPLY=( $( compgen -W '-b -c -e -d -f -i -n -o -p -s -t -v' \
+            -- "$cur" ) )
+        return 0
+    fi
+
+    cur=${cur:=/dev/}
+    _filedir
+} &&
+complete -F _badblocks -o filenames badblocks
+
+
+have dumpe2fs &&
+_dumpe2fs()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -o|-V)
+            return 0
+            ;;
+        -i)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-b -o -f -h -i -x -V' -- "$cur" ) )
+        return 0
+    fi
+
+    cur=${cur:=/dev/}
+    _filedir
+} &&
+complete -F _dumpe2fs -o filenames dumpe2fs
+
+
+have e2freefrag &&
+_e2freefrag()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -c|-h)
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-c -h' -- "$cur" ) )
+        return 0
+    fi
+
+    cur=${cur:=/dev/}
+    _filedir
+} &&
+complete -F _e2freefrag -o filenames e2freefrag
+
+
+have e2label &&
+_e2label()
+{
+    COMPREPLY=()
+    local cur cword
+    _get_comp_words_by_ref cur cword
+
+    if [ $cword -eq 1 ]; then
+        cur=${cur:=/dev/}
+        _filedir
+    fi
+} &&
+complete -F _e2label -o filenames e2label
+
+
+have filefrag &&
+_filefrag()
+{
+    COMPREPLY=()
+    local cur
+    _get_comp_words_by_ref cur
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-B -b -s -v -x' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _filefrag -o filenames filefrag
+
+
+have tune2fs &&
+_tune2fs()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -c|-C|-E|-i|-J|-L|-m|-r|-T)
+            return 0
+            ;;
+        -e)
+            COMPREPLY=( $( compgen -W 'continue remount-ro panic' -- "$cur" ) )
+            return 0
+            ;;
+        -g)
+            _gids
+            COMPREPLY=( $( compgen -g -W '${COMPREPLY[@]}' -- "$cur" ) )
+            return 0
+            ;;
+        -M)
+            _filedir -d
+            ;;
+        -o)
+            local -a opts=(^debug ^bsdgroups ^user_xattr ^acl ^uid16
+                ^journal_data ^journal_data_ordered ^journal_data_writeback)
+            COMPREPLY=( $( compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur" ) )
+            return 0
+            ;;
+        -O)
+            local -a opts=(^dir_index ^filetype ^flex_bg ^has_journal
+                ^large_file ^resize_inode ^sparse_super ^uninit_bg)
+            COMPREPLY=( $( compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur" ) )
+            return 0
+            ;;
+        -u)
+            _uids
+            COMPREPLY=( $( compgen -u -W '${COMPREPLY[@]}' -- "$cur" ) )
+            return 0
+            ;;
+        -U)
+            COMPREPLY=( $( compgen -W 'clear random time' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-c -C -e -E -f -g -i -j -J -l -L -m -M -o
+            -O -r -T -u -U' -- "$cur" ) )
+    fi
+
+    cur=${cur:=/dev/}
+    _filedir
+} &&
+complete -F _tune2fs -o filenames tune2fs
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/badblocks.exp b/test/completion/badblocks.exp
new file mode 100644
index 00000000..74bfcd5d
--- /dev/null
+++ b/test/completion/badblocks.exp
@@ -0,0 +1 @@
+assert_source_completions badblocks
diff --git a/test/completion/dumpe2fs.exp b/test/completion/dumpe2fs.exp
new file mode 100644
index 00000000..22d1523c
--- /dev/null
+++ b/test/completion/dumpe2fs.exp
@@ -0,0 +1 @@
+assert_source_completions dumpe2fs
diff --git a/test/completion/e2freefrag.exp b/test/completion/e2freefrag.exp
new file mode 100644
index 00000000..713ee236
--- /dev/null
+++ b/test/completion/e2freefrag.exp
@@ -0,0 +1 @@
+assert_source_completions e2freefrag
diff --git a/test/completion/e2label.exp b/test/completion/e2label.exp
new file mode 100644
index 00000000..2383c98e
--- /dev/null
+++ b/test/completion/e2label.exp
@@ -0,0 +1 @@
+assert_source_completions e2label
diff --git a/test/completion/filefrag.exp b/test/completion/filefrag.exp
new file mode 100644
index 00000000..eeb5f8ce
--- /dev/null
+++ b/test/completion/filefrag.exp
@@ -0,0 +1 @@
+assert_source_completions filefrag
diff --git a/test/completion/tune2fs.exp b/test/completion/tune2fs.exp
new file mode 100644
index 00000000..db034967
--- /dev/null
+++ b/test/completion/tune2fs.exp
@@ -0,0 +1 @@
+assert_source_completions tune2fs
diff --git a/test/lib/completions/badblocks.exp b/test/lib/completions/badblocks.exp
new file mode 100644
index 00000000..d453b5bd
--- /dev/null
+++ b/test/lib/completions/badblocks.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "badblocks "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/dumpe2fs.exp b/test/lib/completions/dumpe2fs.exp
new file mode 100644
index 00000000..e935c504
--- /dev/null
+++ b/test/lib/completions/dumpe2fs.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "dumpe2fs "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/e2freefrag.exp b/test/lib/completions/e2freefrag.exp
new file mode 100644
index 00000000..1530c9c9
--- /dev/null
+++ b/test/lib/completions/e2freefrag.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "e2freefrag "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/e2label.exp b/test/lib/completions/e2label.exp
new file mode 100644
index 00000000..8ae7f443
--- /dev/null
+++ b/test/lib/completions/e2label.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "e2label "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/filefrag.exp b/test/lib/completions/filefrag.exp
new file mode 100644
index 00000000..fa80cd05
--- /dev/null
+++ b/test/lib/completions/filefrag.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "filefrag "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tune2fs.exp b/test/lib/completions/tune2fs.exp
new file mode 100644
index 00000000..df70d904
--- /dev/null
+++ b/test/lib/completions/tune2fs.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "tune2fs "
+
+
+sync_after_int
+
+
+teardown

From 0fe71268180e093ffccc3ec785a57730092b2274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 19 Sep 2010 19:12:51 +0300
Subject: [PATCH 065/214] (testsuite) Fix cd test when CDPATH is set.

---
 test/lib/completions/cd.exp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 2101f035..6616cd82 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -37,11 +37,12 @@ sync_after_int
 
 set test "Tab should complete CDPATH"
     # Set CDPATH
+assert_bash_exec "declare -p CDPATH &>/dev/null && OLDCDPATH=\$CDPATH || :"
 assert_bash_exec "CDPATH=\$PWD";
 assert_complete "fixtures/shared/default/foo.d/" "cd fixtures/shared/default/fo" $test
 sync_after_int
     # Reset CDPATH
-assert_bash_exec "unset CDPATH"
+assert_bash_exec "declare -p OLDCDPATH &>/dev/null && CDPATH=\$OLDCDPATH || unset CDPATH && unset OLDCDPATH"
 
 
 teardown

From ba419108b7fdb94f2b28a405a1dd074d862b7114 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Mon, 20 Sep 2010 22:54:22 +0200
Subject: [PATCH 066/214] (testsuite) Comment multipass_name

---
 test/lib/library.exp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index eaafcbc4..ffabefcf 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -33,6 +33,7 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
         ]
     ]
     if {$out == -1 && [string length $results] > 0} {
+        # Is DejaGnu fully initialized, i.e. is "fail" method available?
         if {[info exists multipass_name]} {
             fail "ERROR Unexpected output from bash command \"$title\""
         }
@@ -44,6 +45,7 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
     expect {
         -ex "$cmd\r\n0\r\n$prompt" {}
         $prompt {
+            # Is DejaGnu fully initialized, i.e. is "fail" method available?
             if {[info exists multipass_name]} {
                 fail "ERROR executing bash command \"$title\""
             }

From 7a85f76d0151fd64472cd02723ff47da3a4d241f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 23 Sep 2010 22:43:13 +0300
Subject: [PATCH 067/214] (testsuite) Add basic ipmitool tests.

---
 test/completion/ipmitool.exp      |  1 +
 test/lib/completions/ipmitool.exp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 test/completion/ipmitool.exp
 create mode 100644 test/lib/completions/ipmitool.exp

diff --git a/test/completion/ipmitool.exp b/test/completion/ipmitool.exp
new file mode 100644
index 00000000..a5c72a78
--- /dev/null
+++ b/test/completion/ipmitool.exp
@@ -0,0 +1 @@
+assert_source_completions ipmitool
diff --git a/test/lib/completions/ipmitool.exp b/test/lib/completions/ipmitool.exp
new file mode 100644
index 00000000..aa18e3ff
--- /dev/null
+++ b/test/lib/completions/ipmitool.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ipmitool "
+
+
+sync_after_int
+
+
+teardown

From 622abf3a6eb6516fc58ebeaf8de5889cd007802f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 23 Sep 2010 22:45:49 +0300
Subject: [PATCH 068/214] Add quite a bit of more stuff to ipmitool completion.

---
 CHANGES              |   2 +-
 completions/ipmitool | 196 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 187 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index f272503e..48d0f6af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,7 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, jar, povray, and sqlite3 completions.
+  * Improve /etc/init.d/*, ipmitool, jar, povray, and sqlite3 completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/ipmitool b/completions/ipmitool
index fc4ec71c..7af8da88 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -1,6 +1,13 @@
 # bash completion for ipmitool
 
-have ipmitool &&
+have ipmitool && {
+
+_ipmitool_singleline_help()
+{
+    COMPREPLY=( $( compgen -W "$( $1 $2 2>&1 | \
+        sed -ne 's/[,\r]//g' -e 's/^.*[Cc]ommands://p' )" -- "$cur" ) )
+}
+
 _ipmitool()
 {
     local cur prev
@@ -9,25 +16,194 @@ _ipmitool()
     _get_comp_words_by_ref cur prev
 
     case $prev in
+        -h|-V|-p|-U|-e|-k|-y|-P|-m|-b|-t|-B|-T|-l)
+            return 0
+            ;;
+        -d)
+            COMPREPLY=( $( compgen -W "$( \
+                command ls -d /dev/ipmi* /dev/ipmi/* /dev/ipmidev/* \
+                2>/dev/null | sed -ne 's/^[^0-9]*\([0-9]\{1,\}\)/\1/p' )" \
+                -- "$cur" ) )
+            return 0
+            ;;
         -I)
-            COMPREPLY=( $( compgen -W 'open imb lan lanplus free' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( $1 -h 2>&1 | \
+                sed -e '/^Interfaces:/,/^[[:space:]]*$/!d' \
+                -ne 's/^[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*/\1/p' )" \
+                -- "$cur" ) )
+            return 0
+            ;;
+        -H)
+            _known_hosts_real "$cur"
+            return 0
+            ;;
+        -f|-S|-O)
+            _filedir
+            return 0
+            ;;
+        -C)
+            COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9 10 11 12 13 14' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        -L)
+            COMPREPLY=( $( compgen -W 'CALLBACK USER OPERATOR ADMINISTRATOR' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        -A)
+            COMPREPLY=( $( compgen -W 'NONE PASSWORD MD2 MD5 OEM' -- "$cur" ) )
+            return 0
+            ;;
+        -o)
+            COMPREPLY=( $( compgen -W "$( $1 -o list 2>&1 | \
+                awk '/^[ \t]+/ { print $1 }' ) list" -- "$cur" ) )
             return 0
             ;;
     esac
 
-
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '-h -V -v -c -d -I -H -p -U -f -S -a \
-            -e -C -k -y -K -A -P -E -K -m -b -r -B -T -l -o -O' -- "$cur" ) )
-    else
-        COMPREPLY=( $( compgen -W 'raw i2c spd lan chassis power event \
-            mc sdr sensor fru gendev sel pef sol tsol isol user \
-            channel session sunoem kontronoem picmg fwum firewall \
-            exec set hpm ekanalyzer' -- "$cur" ) )
+            -e -C -k -y -L -A -P -E -K -m -b -t -B -T -l -o -O' -- "$cur" ) )
+        return 0
     fi
 
+    # Find out command and subcommand
+
+    local cmds=( raw i2c spd lan chassis power event mc sdr sensor fru gendev
+        sel pef sol tsol isol user channel session sunoem kontronoem picmg fwum
+        firewall shell exec set hpm ekanalyzer)
+    local i c cmd subcmd
+    for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do
+        [[ -n $cmd ]] && subcmd=${COMP_WORDS[i]} && break
+        for c in ${cmds[@]}; do
+            [ ${COMP_WORDS[i]} = $c ] && cmd=$c && break
+        done
+    done
+
+    if [ -z "$cmd" ]; then
+        COMPREPLY=( $( compgen -W '${cmds[@]}' -- "$cur" ) )
+        return 0
+    fi
+
+    # Command/subcommand completions
+
+    case $cmd in
+
+        shell)
+            ;;
+
+        exec)
+            _filedir
+            ;;
+
+        chassis|power|kontronoem|fwum)
+            _ipmitool_singleline_help $1 $cmd
+            ;;
+
+        lan)
+            case $subcmd in
+                print|set)
+                    ;;
+                alert)
+                    [ "$prev" = alert ] && \
+                        COMPREPLY=( $( compgen -W 'print set' -- "$cur" ) )
+                    ;;
+                stats)
+                    [ "$prev" = stats ] && \
+                        COMPREPLY=( $( compgen -W 'print set' -- "$cur" ) )
+                    ;;
+                *)
+                    COMPREPLY=( $( compgen -W 'print set alert stats' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        sdr)
+            case $subcmd in
+                get|info|type|list|entity)
+                    ;;
+                elist)
+                    COMPREPLY=( $( compgen -W 'all full compact event mclog fru
+                        generic' -- "$cur" ) )
+                    ;;
+                dump)
+                    _filedir
+                    ;;
+                fill)
+                    case $prev in
+                        fill)
+                            COMPREPLY=( $( compgen -W 'sensors file' \
+                                -- "$cur" ) )
+                            ;;
+                        file)
+                            _filedir
+                            ;;
+                    esac
+                    ;;
+                *)
+                    COMPREPLY=( $( compgen -W 'get info type list elist entity
+                        dump fill' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        sensor)
+            case $subcmd in
+                list|get|thresh)
+                    ;;
+                *)
+                    COMPREPLY=( $( compgen -W 'list get thresh' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        sel)
+            case $subcmd in
+                info|clear|list|elist|delete)
+                    ;;
+                add|save|writeraw|readraw)
+                    _filedir
+                    ;;
+                time)
+                    [ "$prev" = time ] && \
+                        COMPREPLY=( $( compgen -W 'get set' -- "$cur" ) )
+                    ;;
+                *)
+                    COMPREPLY=( $( compgen -W 'info clear list elist delete add
+                        get save writeraw readraw time' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        user)
+            case $subcmd in
+                summary|list|disable|enable|priv|test)
+                    ;;
+                set)
+                    [ "$prev" = set ] && \
+                        COMPREPLY=( $( compgen -W 'name password' -- "$cur" ) )
+                    ;;
+                *)
+                    COMPREPLY=( $( compgen -W 'summary list set disable enable
+                        priv test' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        set)
+            [ "$prev" = set ] && \
+                COMPREPLY=( $( compgen -W 'hostname username password privlvl
+                    authtype localaddr targetaddr port csv verbose' \
+                        -- "$cur" ) )
+            ;;
+
+    esac
+}
+
 } &&
-complete -F _ipmitool ipmitool
+complete -F _ipmitool -o filenames ipmitool
 
 # Local variables:
 # mode: shell-script

From 372008342efa2ce6918cbc754c34c5f97d1de842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 17:55:51 +0300
Subject: [PATCH 069/214] (testsuite) Run sftp tests with fixtures/sftp data,
 comment fixes.

---
 test/lib/completions/sftp.exp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 7a197c7c..186a055d 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -20,7 +20,7 @@ set expected [get_hosts]
     # Hosts `gee' and `hus' are defined in ./fixtures/sftp/config
     # Hosts `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
 lappend expected doo gee hus ike
-set dir fixtures/scp
+set dir fixtures/sftp
 assert_complete_dir $expected "sftp -F config " $dir
 
 
@@ -45,8 +45,8 @@ sync_after_int
     # Build string list of expected completions
     # Get hostnames and give them a colon (:) suffix
 set expected [get_hosts]
-    # Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced  conf"
-    # Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
+    # Hosts `gee', `hus' and `jar' are defined in "./fixtures/sftp/spaced  conf"
+    # Hosts `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
 lappend expected doo gee hus ike jar
 set dir fixtures/sftp
 assert_complete_dir $expected "sftp -F spaced\\ \\ conf " $dir

From 7f5c64e58014bca82efdb34c0015b091a8c5d84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 17:59:31 +0300
Subject: [PATCH 070/214] (testsuite) Add some [host]:port cases to known hosts
 related tests.

---
 test/fixtures/_known_hosts_real/known_hosts |  2 ++
 test/fixtures/scp/known_hosts               |  1 +
 test/fixtures/sftp/known_hosts              |  1 +
 test/lib/completions/scp.exp                |  8 ++++----
 test/lib/completions/sftp.exp               |  8 ++++----
 test/unit/_known_hosts_real.exp             | 12 ++++++------
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/test/fixtures/_known_hosts_real/known_hosts b/test/fixtures/_known_hosts_real/known_hosts
index bf39e848..07e20ecf 100644
--- a/test/fixtures/_known_hosts_real/known_hosts
+++ b/test/fixtures/_known_hosts_real/known_hosts
@@ -4,3 +4,5 @@ doo
 ike ssh-rsa qwerty1234/Qwerty+1234==
 jub,10.0.0.1
 kyl,100.0.0.2
+[10.10.0.3]:10022
+[blah]:1234
diff --git a/test/fixtures/scp/known_hosts b/test/fixtures/scp/known_hosts
index d54a04d0..2dfa4b6f 100644
--- a/test/fixtures/scp/known_hosts
+++ b/test/fixtures/scp/known_hosts
@@ -2,3 +2,4 @@
 |1|def
 doo
 ike ssh-rsa qwerty1234/Qwerty+1234==
+[blah]:1234
diff --git a/test/fixtures/sftp/known_hosts b/test/fixtures/sftp/known_hosts
index d54a04d0..6538eb4b 100644
--- a/test/fixtures/sftp/known_hosts
+++ b/test/fixtures/sftp/known_hosts
@@ -2,3 +2,4 @@
 |1|def
 doo
 ike ssh-rsa qwerty1234/Qwerty+1234==
+[10.10.10.10]:2222
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index e1f7336e..4ab514d9 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -52,12 +52,12 @@ set test "Tab should complete known-hosts"
     # Build string list of expected completions
     # Get hostnames and give them a colon (:) suffix
     # Hosts `gee' and `hus' are defined in ./fixtures/scp/config
-    # Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
+    # Hosts `blah', `doo' and `ike' are defined in ./fixtures/scp/known_hosts
 set expected {}
 foreach host [get_hosts] {
     lappend expected "$host:"
 }
-lappend expected doo: gee: hus: ike:
+lappend expected blah: doo: gee: hus: ike:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
 set dir fixtures/scp
@@ -90,8 +90,8 @@ foreach host [get_hosts] {
     lappend expected "$host:"
 }
     # Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced  conf"
-    # Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
-lappend expected doo: gee: hus: ike: jar:
+    # Hosts `blah', `doo' and `ike' are defined in ./fixtures/scp/known_hosts
+lappend expected blah: doo: gee: hus: ike: jar:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
 set dir fixtures/scp
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 186a055d..30837ec6 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -18,8 +18,8 @@ setup
     # Build string list of expected completions
 set expected [get_hosts]
     # Hosts `gee' and `hus' are defined in ./fixtures/sftp/config
-    # Hosts `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
-lappend expected doo gee hus ike
+    # Hosts `10.10.10.10', `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
+lappend expected 10.10.10.10 doo gee hus ike
 set dir fixtures/sftp
 assert_complete_dir $expected "sftp -F config " $dir
 
@@ -46,8 +46,8 @@ sync_after_int
     # Get hostnames and give them a colon (:) suffix
 set expected [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in "./fixtures/sftp/spaced  conf"
-    # Hosts `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
-lappend expected doo gee hus ike jar
+    # Hosts `10.10.10.10', `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
+lappend expected 10.10.10.10 doo gee hus ike jar
 set dir fixtures/sftp
 assert_complete_dir $expected "sftp -F spaced\\ \\ conf " $dir
 
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 31842792..0b1a82f9 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -17,8 +17,8 @@ setup
 set test "Hosts should be put in COMPREPLY"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test
 
@@ -29,8 +29,8 @@ sync_after_int
 set test "Hosts should have username prefix and colon suffix"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
 set hosts [lsort -ascii $hosts]
 set expected {}
 foreach host $hosts {
@@ -103,8 +103,8 @@ set test "Empty COMP_KNOWN_HOSTS_WITH_HOSTFILE should omit HOSTFILE"
 assert_bash_exec "COMP_KNOWN_HOSTS_WITH_HOSTFILE="
 set hosts [get_hosts_avahi]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl and 100.0.0.2 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test

From 9341a1131cc9ed9e29d1e118819adb3d8dcf54a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 18:22:45 +0300
Subject: [PATCH 071/214] Fix known hosts completion for IPv6 addresses whose
 last 16 bits are digits (Alioth: #312695, RedHat: #630658).

---
 CHANGES                                     |  2 ++
 bash_completion                             |  3 +--
 test/fixtures/_known_hosts_real/known_hosts |  2 ++
 test/unit/_known_hosts_real.exp             | 12 ++++++------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 48d0f6af..6ccae2c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,8 @@ bash-completion (2.x)
   * Drop bad kompare filename completion (Alioth: #312708).
   * Make _filedir and _filedir_xspec complete uppercase versions of their
     filename extension arguments in addition to exact case matches.
+  * Fix known hosts completion for IPv6 addresses whose last 16 bits are digits
+    (Alioth: #312695, RedHat: #630658).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index f7e1a281..98f35ca1 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1298,8 +1298,7 @@ _known_hosts_real()
             COMPREPLY=( "${COMPREPLY[@]}" $( awk 'BEGIN {FS=","}
             /^\s*[^|\#]/ {for (i=1; i<=2; ++i) { \
             gsub(" .*$", "", $i); \
-            gsub("[\\[\\]]", "", $i); \
-            gsub(":[0-9]+$", "", $i); \
+            sub("^\\[", "", $i); sub("\\](:[0-9]+)?$", "", $i); \
             if ($i ~ /'"$awkcur"'/) {print $i} \
             }}' "${kh[@]}" 2>/dev/null ) )
         fi
diff --git a/test/fixtures/_known_hosts_real/known_hosts b/test/fixtures/_known_hosts_real/known_hosts
index 07e20ecf..65019090 100644
--- a/test/fixtures/_known_hosts_real/known_hosts
+++ b/test/fixtures/_known_hosts_real/known_hosts
@@ -6,3 +6,5 @@ jub,10.0.0.1
 kyl,100.0.0.2
 [10.10.0.3]:10022
 [blah]:1234
+fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555
+fe80::123:0xff:dead:beef%eth0
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 0b1a82f9..8869de11 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -17,8 +17,8 @@ setup
 set test "Hosts should be put in COMPREPLY"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test
 
@@ -29,8 +29,8 @@ sync_after_int
 set test "Hosts should have username prefix and colon suffix"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
 set hosts [lsort -ascii $hosts]
 set expected {}
 foreach host $hosts {
@@ -103,8 +103,8 @@ set test "Empty COMP_KNOWN_HOSTS_WITH_HOSTFILE should omit HOSTFILE"
 assert_bash_exec "COMP_KNOWN_HOSTS_WITH_HOSTFILE="
 set hosts [get_hosts_avahi]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3 and blah in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test

From 66e35aa4a13aa4c4f63f1d9c8da7a4421359ec1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 18:29:26 +0300
Subject: [PATCH 072/214] Use awk sub instead of gsub where appropriate.

---
 bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index 98f35ca1..9e16b9b7 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1297,7 +1297,7 @@ _known_hosts_real()
             # FS needs to look for a comma separated list
             COMPREPLY=( "${COMPREPLY[@]}" $( awk 'BEGIN {FS=","}
             /^\s*[^|\#]/ {for (i=1; i<=2; ++i) { \
-            gsub(" .*$", "", $i); \
+            sub(" .*$", "", $i); \
             sub("^\\[", "", $i); sub("\\](:[0-9]+)?$", "", $i); \
             if ($i ~ /'"$awkcur"'/) {print $i} \
             }}' "${kh[@]}" 2>/dev/null ) )

From 729f6c4ea31709fb5b0e582bc74c2e10b38c50f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 18:50:38 +0300
Subject: [PATCH 073/214] Add mplayer -audio-demuxer and -sub-demuxer
 completions.

---
 CHANGES             | 1 +
 completions/mplayer | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6ccae2c2..962deda5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ bash-completion (2.x)
     filename extension arguments in addition to exact case matches.
   * Fix known hosts completion for IPv6 addresses whose last 16 bits are digits
     (Alioth: #312695, RedHat: #630658).
+  * Improve mplayer and mencoder completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/mplayer b/completions/mplayer
index 7e4c5572..c71c677b 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -18,7 +18,8 @@ _mplayer()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile)
+        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
+        -audio-demuxer|-sub-demuxer)
             _mplayer_options_list $cmd $prev
             return 0
             ;;
@@ -97,7 +98,7 @@ _mplayer()
             return 0
             ;;
         -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -audo-demuxer|-sub-demuxer|-demuxer|-bandwidth|-cache|-chapter| \
+        -demuxer|-bandwidth|-cache|-chapter| \
         -dvd|-dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
         -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
         -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \

From 3fbee9ae9e936d092ee6498ee50d51da0e8cdd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 18:52:23 +0300
Subject: [PATCH 074/214] Drop duplicate -demuxer from mplayer option 'case'
 statement.

---
 completions/mplayer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/mplayer b/completions/mplayer
index c71c677b..00c86f1e 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -98,7 +98,7 @@ _mplayer()
             return 0
             ;;
         -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -demuxer|-bandwidth|-cache|-chapter| \
+        -bandwidth|-cache|-chapter| \
         -dvd|-dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
         -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
         -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \

From 5134d0ac1d8f9a848ad57893060a24e19280f6c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 18:53:33 +0300
Subject: [PATCH 075/214] Add mplayer -show-profile completion.

---
 completions/mplayer | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/completions/mplayer b/completions/mplayer
index 00c86f1e..e7ee093e 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -23,6 +23,10 @@ _mplayer()
             _mplayer_options_list $cmd $prev
             return 0
             ;;
+        -show-profile)
+            _mplayer_options_list $cmd -profile
+            return 0
+            ;;
         -audiofile)
             _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)'
             return 0

From 06083c35639ea06f1463a219d935647338d6a283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 19:04:38 +0300
Subject: [PATCH 076/214] Add Fontconfig patterns to mplayer -font completions.

---
 completions/mplayer | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/completions/mplayer b/completions/mplayer
index e7ee093e..23c45dd7 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -33,6 +33,9 @@ _mplayer()
             ;;
         -font)
             _filedir '@(desc|ttf)'
+            IFS=$'\n'
+            COMPREPLY=( "${COMPREPLY[@]}"
+                $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) )
             return 0
             ;;
         -sub)

From 5a254604e7880ba2a38cb49be40b81de3c30a9bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 19:07:01 +0300
Subject: [PATCH 077/214] Add mplayer -subfont completion.

---
 completions/mplayer | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/completions/mplayer b/completions/mplayer
index 23c45dd7..051f77b8 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -31,8 +31,12 @@ _mplayer()
             _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)'
             return 0
             ;;
-        -font)
-            _filedir '@(desc|ttf)'
+        -font|-subfont)
+            if [ "$prev" = -font ]; then
+                _filedir '@(desc|ttf)'
+            else
+                _filedir ttf
+            fi
             IFS=$'\n'
             COMPREPLY=( "${COMPREPLY[@]}"
                 $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) )

From 1a2de64f80aa1899553de5f6176f3d2fdb63f2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 19:11:54 +0300
Subject: [PATCH 078/214] Localize IFS tighter in _mplayer().

---
 completions/mplayer | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/completions/mplayer b/completions/mplayer
index 051f77b8..f82d1c4d 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -11,7 +11,7 @@ _mplayer_options_list()
 
 _mplayer()
 {
-    local cmd cur prev skinsdir IFS=$' \t\n' i j k=0
+    local cmd cur prev skinsdir i j k=0
 
     COMPREPLY=()
     cmd=${COMP_WORDS[0]}
@@ -37,7 +37,7 @@ _mplayer()
             else
                 _filedir ttf
             fi
-            IFS=$'\n'
+            local IFS=$'\n'
             COMPREPLY=( "${COMPREPLY[@]}"
                 $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) )
             return 0
@@ -48,7 +48,7 @@ _mplayer()
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
-            IFS=$'\t\n'
+            local IFS=$'\t\n'
             COMPREPLY=( $( for i in "${COMPREPLY[@]}"; do
                         if [[ -f $i && -r $i ]]; then
                             printf '%s\n' ${i%.*}
@@ -56,7 +56,6 @@ _mplayer()
                             printf '%s\n' $i
                         fi
                        done ) )
-            IFS=$' \t\n'
             return 0
             ;;
         -ifo)
@@ -76,7 +75,7 @@ _mplayer()
                 skinsdir=/usr/share/mplayer/Skin
             fi
 
-            IFS=$'\t\n'
+            local IFS=$'\t\n'
             for i in ~/.mplayer/Skin $skinsdir; do
                 if [[ -d $i && -r $i ]]; then
                     for j in $( compgen -d $i/$cur ); do
@@ -85,7 +84,6 @@ _mplayer()
                     done
                 fi
             done
-            IFS=$' \t\n'
             return 0
             ;;
         -cdrom-device)

From 35ac650e306fab403dad34171e953f08874a4fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 28 Sep 2010 19:14:08 +0300
Subject: [PATCH 079/214] Make mplayer -skin completion work with post-2006
 versions.

The subdir was "Skin" until 1.0pre8 (Jun 2006), "skins" in and after it.
---
 completions/mplayer | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/completions/mplayer b/completions/mplayer
index f82d1c4d..5d1b87cf 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -11,7 +11,7 @@ _mplayer_options_list()
 
 _mplayer()
 {
-    local cmd cur prev skinsdir i j k=0
+    local cmd cur prev i j k=0
 
     COMPREPLY=()
     cmd=${COMP_WORDS[0]}
@@ -69,14 +69,15 @@ _mplayer()
         -skin)
             # if you don't have installed mplayer in /usr you
             # may want to set the MPLAYER_SKINS_DIR global variable
+            local -a dirs
             if [ -n "$MPLAYER_SKINS_DIR" ]; then
-                skinsdir=$MPLAYER_SKINS_DIR
+                dirs=($MPLAYER_SKINS_DIR)
             else
-                skinsdir=/usr/share/mplayer/Skin
+                dirs=(/usr/share/mplayer/skins /usr/local/share/mplayer/skins)
             fi
 
             local IFS=$'\t\n'
-            for i in ~/.mplayer/Skin $skinsdir; do
+            for i in ~/.mplayer/skins ${dirs[@]}; do
                 if [[ -d $i && -r $i ]]; then
                     for j in $( compgen -d $i/$cur ); do
                         COMPREPLY[$k]=${j#$i/}

From 3d8efed6182454fd0913522406a10d1bf8a3d19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 4 Oct 2010 20:49:17 +0300
Subject: [PATCH 080/214] Fixes to completions for filenames containing tabs
 (RedHat: #629518).

---
 CHANGES             | 1 +
 bash_completion     | 8 ++++----
 completions/bzip2   | 2 +-
 completions/gzip    | 2 +-
 completions/lrzip   | 2 +-
 completions/lzma    | 2 +-
 completions/lzop    | 2 +-
 completions/mplayer | 4 ++--
 completions/perl    | 2 +-
 completions/ssh     | 6 +++---
 completions/wvdial  | 4 ++--
 completions/xz      | 2 +-
 12 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGES b/CHANGES
index 962deda5..dd9574b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ bash-completion (2.x)
   * Fix known hosts completion for IPv6 addresses whose last 16 bits are digits
     (Alioth: #312695, RedHat: #630658).
   * Improve mplayer and mencoder completions.
+  * Fixes to completions for filenames containing tabs (RedHat: #629518).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 9e16b9b7..e3ae3089 100644
--- a/bash_completion
+++ b/bash_completion
@@ -615,7 +615,7 @@ _quote_readline_by_ref()
 #
 _filedir()
 {
-    local i IFS=$'\t\n' xspec
+    local i IFS=$'\n' xspec
 
     _tilde "$cur" || return 0
 
@@ -1361,7 +1361,7 @@ complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 ping \
 #
 _cd()
 {
-    local cur IFS=$'\t\n' i j k
+    local cur IFS=$'\n' i j k
     _get_comp_words_by_ref cur
 
     # try to allow variable completion
@@ -1384,7 +1384,7 @@ _cd()
     local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)
 
     # we have a CDPATH, so loop on its contents
-    for i in ${CDPATH//:/$'\t'}; do
+    for i in ${CDPATH//:/$'\n'}; do
         # create an array of matched subdirs
         k="${#COMPREPLY[@]}"
         for j in $( compgen -d $i/$cur ); do
@@ -1564,7 +1564,7 @@ _filedir_xspec()
 {
     local IFS cur xspec
 
-    IFS=$'\t\n'
+    IFS=$'\n'
     COMPREPLY=()
     _get_comp_words_by_ref cur
 
diff --git a/completions/bzip2 b/completions/bzip2
index f4902e29..be030274 100644
--- a/completions/bzip2
+++ b/completions/bzip2
@@ -21,7 +21,7 @@ _bzip2()
         return 0
     fi
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
 
     xspec="*.bz2"
     if [[ "$prev" == --* ]]; then
diff --git a/completions/gzip b/completions/gzip
index 0951f72f..afd647ed 100644
--- a/completions/gzip
+++ b/completions/gzip
@@ -21,7 +21,7 @@ _gzip()
         return 0
     fi
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
 
     xspec="*.@(gz|t[ag]z)"
     if [[ "$prev" == --* ]]; then
diff --git a/completions/lrzip b/completions/lrzip
index e5848035..445fc3c5 100644
--- a/completions/lrzip
+++ b/completions/lrzip
@@ -48,7 +48,7 @@ _lrzip()
 
     _expand || return 0
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
diff --git a/completions/lzma b/completions/lzma
index a176f191..c2fece97 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -16,7 +16,7 @@ _lzma()
         return 0
     fi
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
 
     xspec="*.@(lzma|tlz)"
     if [[ "$prev" == --* ]]; then
diff --git a/completions/lzop b/completions/lzop
index 19852b24..7a34ae3e 100644
--- a/completions/lzop
+++ b/completions/lzop
@@ -53,7 +53,7 @@ _lzop()
 
     _expand || return 0
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
             $( compgen -d -- "$cur" ) )
 } &&
diff --git a/completions/mplayer b/completions/mplayer
index 5d1b87cf..39ac93d3 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -48,7 +48,7 @@ _mplayer()
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
-            local IFS=$'\t\n'
+            local IFS=$'\n'
             COMPREPLY=( $( for i in "${COMPREPLY[@]}"; do
                         if [[ -f $i && -r $i ]]; then
                             printf '%s\n' ${i%.*}
@@ -76,7 +76,7 @@ _mplayer()
                 dirs=(/usr/share/mplayer/skins /usr/local/share/mplayer/skins)
             fi
 
-            local IFS=$'\t\n'
+            local IFS=$'\n'
             for i in ~/.mplayer/skins ${dirs[@]}; do
                 if [[ -d $i && -r $i ]]; then
                     for j in $( compgen -d $i/$cur ); do
diff --git a/completions/perl b/completions/perl
index ea71b2f4..9a1d84bf 100644
--- a/completions/perl
+++ b/completions/perl
@@ -30,7 +30,7 @@ _perl()
     # only handle module completion for now
     case $prev in
         -I|-x)
-            local IFS=$'\t\n'
+            local IFS=$'\n'
             COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
             return 0
             ;;
diff --git a/completions/ssh b/completions/ssh
index b4bafdee..2c20c2d3 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -246,13 +246,13 @@ _sftp()
 shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to escape in remote scp paths
-_scp_path_esc="[][(){}<>\",:;^&\!$=?\`|\\ ']"
+_scp_path_esc="[][(){}<>\",:;^&\!$=?\`|\\ \t']"
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
 _scp_remote_files()
 {
-    local IFS=$'\t\n'
+    local IFS=$'\n'
 
     # remove backslash escape from the first colon
     cur=${cur/\\:/:}
@@ -291,7 +291,7 @@ _scp_remote_files()
 # an optional prefix to add to returned completions.
 _scp_local_files()
 {
-    local IFS=$'\t\n'
+    local IFS=$'\n'
 
     local dirsonly=false
     if [ "$1" = -d ]; then
diff --git a/completions/wvdial b/completions/wvdial
index 101112ca..3b135f0a 100644
--- a/completions/wvdial
+++ b/completions/wvdial
@@ -3,7 +3,7 @@
 have wvdial &&
 _wvdial()
 {
-    local cur prev config i IFS=$'\t\n'
+    local cur prev config i IFS=$'\n'
 
     COMPREPLY=()
     _get_comp_words_by_ref cur prev
@@ -23,7 +23,7 @@ _wvdial()
             ;;
         *)
             # start with global and personal config files
-            config="/etc/wvdial.conf"$'\t'"$HOME/.wvdialrc"
+            config="/etc/wvdial.conf"$'\n'"$HOME/.wvdialrc"
             # replace with command line config file if present
             for (( i=1; i < COMP_CWORD; i++ )); do
                 if [[ "${COMP_WORDS[i]}" == "--config" ]]; then
diff --git a/completions/xz b/completions/xz
index 46420b01..f947b080 100644
--- a/completions/xz
+++ b/completions/xz
@@ -52,7 +52,7 @@ _xz()
 
     _expand || return 0
 
-    local IFS=$'\t\n'
+    local IFS=$'\n'
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&

From 1da64f602a79745edb121767a2c27ce2e3a4288c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 4 Oct 2010 21:29:44 +0300
Subject: [PATCH 081/214] More known hosts IPv6 completion fixes, thanks to
 Yoshinori KUNIGA.

https://bugzilla.redhat.com/show_bug.cgi?id=630658#c4
---
 CHANGES                                     |  3 +--
 bash_completion                             | 16 ++++++++--------
 test/fixtures/_known_hosts_real/known_hosts |  3 +++
 test/unit/_known_hosts_real.exp             | 12 ++++++------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index dd9574b0..d8481e94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,8 +22,7 @@ bash-completion (2.x)
   * Drop bad kompare filename completion (Alioth: #312708).
   * Make _filedir and _filedir_xspec complete uppercase versions of their
     filename extension arguments in addition to exact case matches.
-  * Fix known hosts completion for IPv6 addresses whose last 16 bits are digits
-    (Alioth: #312695, RedHat: #630658).
+  * IPv6 known hosts completion fixes (Alioth: #312695, RedHat: #630658).
   * Improve mplayer and mencoder completions.
   * Fixes to completions for filenames containing tabs (RedHat: #629518).
 
diff --git a/bash_completion b/bash_completion
index e3ae3089..e88c662d 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1279,16 +1279,16 @@ _known_hosts_real()
         awkcur=${awkcur//\./\\\.}
         curd=$awkcur
 
-        if [[ "$awkcur" == [0-9]*.* ]]; then
-            # Digits followed by a dot - just search for that
-            awkcur="^$awkcur.*"
+        if [[ "$awkcur" == [0-9]*[.:]* ]]; then
+            # Digits followed by a dot or a colon - just search for that
+            awkcur="^$awkcur[.:]*"
         elif [[ "$awkcur" == [0-9]* ]]; then
-            # Digits followed by no dot - search for digits followed
-            # by a dot
-            awkcur="^$awkcur.*\."
+            # Digits followed by no dot or colon - search for digits followed
+            # by a dot or a colon
+            awkcur="^$awkcur.*[.:]"
         elif [ -z "$awkcur" ]; then
-            # A blank - search for a dot or an alpha character
-            awkcur="[a-z.]"
+            # A blank - search for a dot, a colon, or an alpha character
+            awkcur="[a-z.:]"
         else
             awkcur="^$awkcur"
         fi
diff --git a/test/fixtures/_known_hosts_real/known_hosts b/test/fixtures/_known_hosts_real/known_hosts
index 65019090..f655eaa3 100644
--- a/test/fixtures/_known_hosts_real/known_hosts
+++ b/test/fixtures/_known_hosts_real/known_hosts
@@ -8,3 +8,6 @@ kyl,100.0.0.2
 [blah]:1234
 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555
 fe80::123:0xff:dead:beef%eth0
+1111:2222:3333:4444:5555:6666:xxxx:abab
+11xx:2222:3333:4444:5555:6666:xxxx:abab
+::42
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 8869de11..c23a9cef 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -17,8 +17,8 @@ setup
 set test "Hosts should be put in COMPREPLY"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, and bunch of IPv6 test cases in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0 1111:2222:3333:4444:5555:6666:xxxx:abab 11xx:2222:3333:4444:5555:6666:xxxx:abab ::42
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test
 
@@ -29,8 +29,8 @@ sync_after_int
 set test "Hosts should have username prefix and colon suffix"
 set hosts [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, and bunch of IPv6 test cases in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0 1111:2222:3333:4444:5555:6666:xxxx:abab 11xx:2222:3333:4444:5555:6666:xxxx:abab ::42
 set hosts [lsort -ascii $hosts]
 set expected {}
 foreach host $hosts {
@@ -103,8 +103,8 @@ set test "Empty COMP_KNOWN_HOSTS_WITH_HOSTFILE should omit HOSTFILE"
 assert_bash_exec "COMP_KNOWN_HOSTS_WITH_HOSTFILE="
 set hosts [get_hosts_avahi]
     # Hosts `gee', `hus' and `jar' are defined in ./fixtures/_known_hosts_real/config
-    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 and fe80::123:0xff:dead:beef%eth0 in ./fixtures/_known_hosts_real/known_hosts
-lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0
+    # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, and bunch of IPv6 test cases in ./fixtures/_known_hosts_real/known_hosts
+lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0 1111:2222:3333:4444:5555:6666:xxxx:abab 11xx:2222:3333:4444:5555:6666:xxxx:abab ::42
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
 assert_bash_list $hosts $cmd $test

From e8d84b300471944e6413bd9f6312dd57ee27b922 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Tue, 5 Oct 2010 21:39:58 +0200
Subject: [PATCH 082/214] Bugfix __reassemble_comp_words_by_ref a b:c |<TAB>
 (with |=cursor) did not return `b:c' as `prev' on bash-4.1 (Alioth #312740)

---
 bash_completion                      |  2 +-
 test/unit/_get_comp_words_by_ref.exp | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index e88c662d..a34015c3 100644
--- a/bash_completion
+++ b/bash_completion
@@ -308,7 +308,7 @@ __reassemble_comp_words_by_ref() {
             ref="$2[$j]"
             eval $2[$j]=\${!ref}\${COMP_WORDS[i]}
             # Indicate new cword
-            [[ $i == $COMP_CWORD && ${COMP_WORDS[i]} ]] && eval $3=$j
+            [[ $i == $COMP_CWORD ]] && eval $3=$j
         done
     else
         # No, list of word completions separators hasn't changed;
diff --git a/test/unit/_get_comp_words_by_ref.exp b/test/unit/_get_comp_words_by_ref.exp
index c88ad6f6..cb3f4dad 100644
--- a/test/unit/_get_comp_words_by_ref.exp
+++ b/test/unit/_get_comp_words_by_ref.exp
@@ -202,6 +202,21 @@ assert_bash_list {"c: b"} $cmd $test
 sync_after_int
 
 
+set test {a b:c | with WORDBREAKS -= :};  # | = cursor position
+if {[lindex $::BASH_VERSINFO 0] <= 3} {
+    set cmd {COMP_WORDS=(a b:c ''); COMP_CWORD=2}
+} else {
+    set cmd {COMP_WORDS=(a b : c ''); COMP_CWORD=4}
+}
+append cmd {; COMP_LINE='a b:c '; COMP_POINT=6}
+assert_bash_exec $cmd $test
+set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
+assert_bash_list {" b:c"} $cmd $test
+
+
+sync_after_int
+
+
 set test {a :| with WORDBREAKS -= : should return :};  # | = cursor position
 set cmd {COMP_WORDS=(a :); COMP_CWORD=1; COMP_LINE='a :'; COMP_POINT=3}
 assert_bash_exec $cmd

From 4e8bc5086539f6a6407dc08c3af4d50d2e294b39 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Tue, 5 Oct 2010 21:46:01 +0200
Subject: [PATCH 083/214] Updated CHANGES

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index d8481e94..17c9100f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ bash-completion (2.x)
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
   * Speed up `compopt' availability detection
   * Fix _filedir `-o filenames' detection on bash-3 (Alioth: #312646)
+  * Fix __reassemble_comp_words_by_ref (Alioth #312740)
 
   [ Anton Khirnov ]
   * Improve mplayer and mencoder completions.

From 77b78b372371b0093ad93840cb28f2efe94ef5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 5 Oct 2010 23:40:13 +0300
Subject: [PATCH 084/214] Add sysbench completion.

---
 CHANGES                           |   2 +-
 completions/Makefile.am           |   1 +
 completions/sysbench              | 175 ++++++++++++++++++++++++++++++
 test/completion/sysbench.exp      |   1 +
 test/lib/completions/sysbench.exp |  20 ++++
 5 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 completions/sysbench
 create mode 100644 test/completion/sysbench.exp
 create mode 100644 test/lib/completions/sysbench.exp

diff --git a/CHANGES b/CHANGES
index 17c9100f..d2269f41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, filefrag,
-    iftop, lrzip, POSIX sh, tune2fs, xmodmap, and xrdb completions.
+    iftop, lrzip, POSIX sh, sysbench, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index f335b5d0..5c904295 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -143,6 +143,7 @@ bashcomp_DATA = abook \
 		sshfs \
 		strace \
 		svk \
+		sysbench \
 		sysctl \
 		sysv-rc \
 		tar \
diff --git a/completions/sysbench b/completions/sysbench
new file mode 100644
index 00000000..06acdc40
--- /dev/null
+++ b/completions/sysbench
@@ -0,0 +1,175 @@
+# bash completion for sysbench
+
+# We set -o nospace and turn it off in quite a few place for bash < 4
+# reasons; assuming bash >= 4 we could instead not turn it on
+# initially but only in the few cases where it's actually needed.
+
+have sysbench &&
+_sysbench()
+{
+    COMPREPLY=()
+    local cur prev words cword split=false
+    _get_comp_words_by_ref -n = cur prev words cword
+
+    # long options need the "=" (whitespace split doesn't work), but we split
+    # internally to make processing easier
+    _split_longopt && split=true
+
+    case $prev in
+        --num-threads|--max-requests|--max-time|--thread-stack-size| \
+        --help|--version|help|version)
+            return 0
+            ;;
+        --init-rng|--debug|--validate)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
+            return 0
+            ;;
+        --test)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'fileio cpu memory threads mutex oltp' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        --cpu-max-prime)
+            return 0
+            ;;
+        --file-test-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'seqwr seqrewr seqrd rndrd rndwr rndrw' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        --file-io-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'sync async fastmmap slowmmap' \
+                -- "$cur" ) )
+            return 0
+            ;;
+        --file-extra-flags)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'sync dsync direct' -- "$cur" ) )
+            return 0
+            ;;
+        --file-fsync-all|--file-fsync-end)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
+            return 0
+            ;;
+        --file-fsync-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'fsync fdatasync' -- "$cur" ) )
+            return 0
+            ;;
+        --memory-scope)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'global local' -- "$cur" ) )
+            return 0
+            ;;
+        --memory-hugetlb)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
+            return 0
+            ;;
+        --memory-oper)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'read write none' -- "$cur" ) )
+            return 0
+            ;;
+        --memory-access-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'seq rnd' -- "$cur" ) )
+            return 0
+            ;;
+        --oltp-test-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'simple complex nontrx sp' -- "$cur" ) )
+            return 0
+            ;;
+        --oltp-read-only|--oltp-skip-trx|--oltp-quto-inc|--mysql-ssl)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
+            return 0
+            ;;
+        --oltp-nontrx-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'select update_key update_nokey insert
+                delete' -- "$cur" ) )
+            return 0
+            ;;
+        --oltp-dist-type)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'uniform gaussian special' -- "$cur" ) )
+            return 0
+            ;;
+        --db-driver)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W "$( $1 --test=oltp help 2>/dev/null |
+                sed -e '/^.*database drivers:/,/^$/!d' \
+                   -ne 's/^  *\([^ ]*\) .*/\1/p' )" -- "$cur" ) )
+            return 0
+            ;;
+        --db-ps-mode)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'auto disable' -- "$cur" ) )
+            return 0
+            ;;
+        --mysql-socket)
+            compopt +o nospace &>/dev/null
+            _filedir sock
+            return 0
+            ;;
+        --mysql-table-engine)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'myisam innodb bdb heap ndbcluster
+                federated' -- "$cur" ) )
+            return 0
+            ;;
+        --mysql-engine-trx)
+            compopt +o nospace &>/dev/null
+            COMPREPLY=( $( compgen -W 'yes no auto' -- "$cur" ) )
+            return 0
+            ;;
+        --*)
+            $split && return 0
+            ;;
+    esac
+
+    # find out which test we're running
+    local i test
+    for (( i=1 ; $i < ${#words[@]}-1 ; i++ )); do
+        if [[ ${words[i]} == --test* ]]; then
+            test=${words[i]#*=}
+            break
+        fi
+    done
+
+    local opts="--num-threads= --max-requests= --max-time= --thread-stack-size=
+        --init-rng= --debug= --validate= --help --version"
+
+    if [[ $test ]]; then
+        local help=( $( _parse_help $1 "--test=$test help" ) )
+        opts="$opts ${help[@]/%/=} prepare run cleanup help version"
+    else
+        opts="$opts --test="
+    fi
+
+    if [[ "$cur" == -* || ! $test ]]; then
+        COMPREPLY=( $( compgen -W "$opts" -- "$cur" ) )
+        [[ ${#COMPREPLY[@]} == 1 && ${COMPREPLY[0]} != *= ]] && \
+            compopt +o nospace &>/dev/null
+    else
+        compopt +o nospace &>/dev/null
+        COMPREPLY=( $( compgen -W "prepare run cleanup help version" \
+            -- "$cur" ) )
+    fi
+} &&
+complete -F _sysbench -o nospace sysbench
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/sysbench.exp b/test/completion/sysbench.exp
new file mode 100644
index 00000000..68da0a7a
--- /dev/null
+++ b/test/completion/sysbench.exp
@@ -0,0 +1 @@
+assert_source_completions sysbench
diff --git a/test/lib/completions/sysbench.exp b/test/lib/completions/sysbench.exp
new file mode 100644
index 00000000..2a0fe339
--- /dev/null
+++ b/test/lib/completions/sysbench.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "sysbench "
+
+
+sync_after_int
+
+
+teardown

From 267fb3205df377393959240b47d11a9b4670dfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 5 Oct 2010 23:55:30 +0300
Subject: [PATCH 085/214] Drop unused cword.

---
 completions/sysbench | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/completions/sysbench b/completions/sysbench
index 06acdc40..7781791e 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -8,8 +8,8 @@ have sysbench &&
 _sysbench()
 {
     COMPREPLY=()
-    local cur prev words cword split=false
-    _get_comp_words_by_ref -n = cur prev words cword
+    local cur prev words split=false
+    _get_comp_words_by_ref -n = cur prev words
 
     # long options need the "=" (whitespace split doesn't work), but we split
     # internally to make processing easier

From 27dab7e198dbc5d7fe20766dc0e01174d7b8f946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 5 Oct 2010 23:59:09 +0300
Subject: [PATCH 086/214] Allow setting option for creating output to parse in
 _parse_help().

Required in just added sysbench completion.
---
 bash_completion | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bash_completion b/bash_completion
index a34015c3..1ba2d071 100644
--- a/bash_completion
+++ b/bash_completion
@@ -706,12 +706,12 @@ _split_longopt()
     return 1
 }
 
-# This function tries to parse the output of $command --help
+# This function tries to parse the help output of the given command.
+# @param $1  command
+# @param $2  command options (default: --help)
 #
 _parse_help() {
-    local cmd
-    cmd=$1
-    $cmd --help 2>&1 | command grep -- "^[[:space:]]*-" | tr "," " " | \
+    $1 ${2:---help} 2>&1 | command grep -- "^[[:space:]]*-" | tr "," " " | \
         awk '{print $1; if ($2 ~ /-.*/) { print $2 } }' | sed -e "s:=.*::g"
 }
 

From f0cc5fc2a8642c0acc925c31a0fd81e05f68f62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Oct 2010 18:03:59 +0300
Subject: [PATCH 087/214] Add ether-wake completion.

---
 CHANGES                             |  5 +++--
 completions/net-tools               | 26 ++++++++++++++++++++++++++
 test/completion/ether-wake.exp      |  1 +
 test/lib/completions/ether-wake.exp | 20 ++++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 test/completion/ether-wake.exp
 create mode 100644 test/lib/completions/ether-wake.exp

diff --git a/CHANGES b/CHANGES
index d2269f41..a127231d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,9 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, filefrag,
-    iftop, lrzip, POSIX sh, sysbench, tune2fs, xmodmap, and xrdb completions.
+  * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
+    filefrag, iftop, lrzip, POSIX sh, sysbench, tune2fs, xmodmap, and xrdb
+    completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/net-tools b/completions/net-tools
index 5b86a64a..e7de2b04 100644
--- a/completions/net-tools
+++ b/completions/net-tools
@@ -96,6 +96,32 @@ _route()
 } &&
 complete -F _route route
 
+have ether-wake &&
+_ether_wake()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref -n : cur prev
+
+    case $prev in
+        -i)
+            _available_interfaces
+            return 0
+            ;;
+        -p)
+            return 0
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '-b -D -i -p -V' -- "$cur" ) )
+        return 0
+    fi
+
+    _mac_addresses
+} &&
+complete -F _ether_wake ether-wake
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
diff --git a/test/completion/ether-wake.exp b/test/completion/ether-wake.exp
new file mode 100644
index 00000000..602ba271
--- /dev/null
+++ b/test/completion/ether-wake.exp
@@ -0,0 +1 @@
+assert_source_completions ether-wake
diff --git a/test/lib/completions/ether-wake.exp b/test/lib/completions/ether-wake.exp
new file mode 100644
index 00000000..fe1aa174
--- /dev/null
+++ b/test/lib/completions/ether-wake.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ether-wake "
+
+
+sync_after_int
+
+
+teardown

From 4cd7c7c87254e8fd39ee4c7fcb423ea3d26c7db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Oct 2010 20:05:55 +0300
Subject: [PATCH 088/214] Treat *.spm as *.src.rpm.

Source rpms are sometimes named *.spm, e.g. in SUSE.
---
 bash_completion   |  4 ++--
 completions/_mock |  2 +-
 completions/rpm   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bash_completion b/bash_completion
index 1ba2d071..af10c395 100644
--- a/bash_completion
+++ b/bash_completion
@@ -102,7 +102,7 @@ complete -f -X '!*.fig' xfig
 complete -f -X '!*.@(mid?(i)|cmf)' playmidi
 complete -f -X '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
 complete -f -X '!*.@(m[eo]d|s[3t]m|xm|it)' modplugplay modplug123
-complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
+complete -f -X '*.@(o|so|so.!(conf)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
 complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
 complete -f -X '!*.@(zip|z|gz|tgz)' bzme
 # konqueror not here on purpose, it's more than a web/html browser
@@ -113,7 +113,7 @@ complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|ods|ots)' oocalc
 complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw
 complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
 complete -f -X '!*.odb' oobase
-complete -f -X '!*.rpm' rpm2cpio
+complete -f -X '!*.[rs]pm' rpm2cpio
 complete -f -X '!*.aux' bibtex
 complete -f -X '!*.po' poedit gtranslator kbabel lokalize
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
diff --git a/completions/_mock b/completions/_mock
index f16f116d..40e422ce 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -72,7 +72,7 @@ _mock()
             --sources --verbose --quiet --trace --enable-plugin \
             --disable-plugin --print-root-path' -- "$cur" ) )
     else
-        _filedir '?(no)src.rpm'
+        _filedir '@(?(no)src.r|s)pm'
     fi
 } &&
 complete -F _mock -o filenames mock
diff --git a/completions/rpm b/completions/rpm
index d268cabd..16870dad 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -164,7 +164,7 @@ _rpm()
                 --excludepath --ignoresize --oldpackage \
                 --queryformat --repackage --nosuggests" -- "$cur" ) )
             else
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             fi
             ;;
         -e|--erase)
@@ -201,7 +201,7 @@ _rpm()
                     COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
                         --httpport --httpproxy --nomanifest" -- "$cur" ) )
                 else
-                    _filedir 'rpm'
+                    _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
@@ -221,7 +221,7 @@ _rpm()
                 COMPREPLY=( $( compgen -W "$opts --nopgp --nogpg --nomd5" \
                     -- "$cur" ) )
             else
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             fi
             ;;
         -[Vy]*|--verify)
@@ -236,7 +236,7 @@ _rpm()
             elif [[ $COMP_LINE == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups
             elif [[ $COMP_LINE == *\ -@(*([^ -])p|-package )* ]]; then
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             else
                 _rpm_installed_packages "$nodig" "$nosig"
             fi
@@ -257,14 +257,14 @@ _rpm()
                 COMPREPLY=( $( compgen -W "$opts --nodeps --rmsource \
                   --rmspec --sign --nodirtokens --target" -- "$cur" ) )
             else
-                _filedir '?(no)src.rpm'
+                _filedir '@(?(no)src.r|s)pm'
             fi
             ;;
         --tarbuild)
             _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar.@(lzma|Z))'
             ;;
         --resign|--addsign)
-            _filedir 'rpm'
+            _filedir '[rs]pm'
             ;;
         --setperms|--setgids)
             _rpm_installed_packages "$nodig" "$nosig"

From a55f76336311a695d84097068e67e30014926ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Oct 2010 20:07:46 +0300
Subject: [PATCH 089/214] Trivial cleanups.

---
 completions/rpm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/completions/rpm b/completions/rpm
index 16870dad..0dbcd048 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -247,7 +247,7 @@ _rpm()
                     --clean --rmsource --rmspec --test --sign --buildroot \
                     --target --nobuild --nodeps --nodirtokens" -- "$cur" ) )
             elif [[ ${COMP_WORDS[1]} == -b* ]]; then
-                _filedir 'spec'
+                _filedir spec
             else
                 _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar.@(lzma|Z))'
             fi
@@ -274,13 +274,12 @@ _rpm()
                 COMPREPLY=( $( compgen -W '--clean --rmsource --rmspec' \
                     -- "$cur" ) )
             else
-                _filedir 'spec'
+                _filedir spec
             fi
             ;;
         --import|--dbpath|--root)
             if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--import --dbpath --root' \
-                    -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--import --dbpath --root' -- "$cur" ) )
             else
                 _filedir
             fi

From 96b1594e4ef76b48491bb5d6d0f14720fec36c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Oct 2010 20:37:06 +0300
Subject: [PATCH 090/214] Use "compopt -o filenames" if available instead of
 "compgen -f" hack in _cd().

---
 bash_completion | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index af10c395..5c6c850a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1370,8 +1370,10 @@ _cd()
         return 0
     fi
 
-    # Enable -o filenames option, see Debian bug #272660
-    compgen -f /non-existing-dir/ >/dev/null
+    # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
+    # info about the compgen hack (bash < 4)
+    compopt -o filenames 2>/dev/null || \
+        compgen -f /non-existing-dir/ >/dev/null
 
     # Use standard dir completion if no CDPATH or parameter starts with /,
     # ./ or ../

From cb6a9a4dfedf7f9a45ae9f6c010b73aae2d33323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 7 Oct 2010 20:39:10 +0300
Subject: [PATCH 091/214] Use "compgen -f" hack from _cd() instead of emulating
 -o filenames in _filedir().

See http://bugs.debian.org/272660#64 for more info about the hack.
---
 bash_completion | 43 ++++---------------------------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/bash_completion b/bash_completion
index 5c6c850a..b2b3f1b0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -643,45 +643,10 @@ _filedir()
             xspec=${1:+"!*.@($1|$(printf %s $1 | tr '[:lower:]' '[:upper:]'))"}
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
         if [ ${#toks[@]} -ne 0 ]; then
-            # If `compopt' is available, set `-o filenames'
-            type compopt &>/dev/null && compopt -o filenames 2>/dev/null ||
-            # No, `compopt' isn't available;
-            # Is `-o filenames' set?
-            [[ (
-                ${COMP_WORDS[0]} && 
-                "$(complete -p ${COMP_WORDS[0]} 2>/dev/null)" == \
-                    *"-o filenames"*
-            ) ]] || {
-                # No, `-o filenames' isn't set;
-                # Emulate `-o filenames'
-                # NOTE: A side-effect of emulating `-o filenames' is that
-                #       backslash escape characters are visible within the list
-                #       of presented completions, e.g.  the completions look
-                #       like:
-                #
-                #           $ foo a<TAB>
-                #           a\ b/  a\$b/
-                #
-                #       whereas with `-o filenames' active the completions look
-                #       like:
-                #
-                #           $ ls a<TAB>
-                #           a b/  a$b/
-                #
-                for ((i=0; i < ${#toks[@]}; i++)); do
-                    # If directory exists, append slash (/)
-                    if [[ ${cur:0:1} != "'" ]]; then
-                        [[ -d ${toks[i]} ]] && toks[i]="${toks[i]}"/
-                        if [[ ${cur:0:1} == '"' ]]; then
-                            toks[i]=${toks[i]//\\/\\\\}
-                            toks[i]=${toks[i]//\"/\\\"}
-                            toks[i]=${toks[i]//\$/\\\$}
-                        else
-                            toks[i]=$(printf %q ${toks[i]})
-                        fi
-                    fi
-                done
-            }
+            # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
+            # info about the compgen hack (bash < 4)
+            compopt -o filenames 2>/dev/null || \
+                compgen -f /non-existing-dir/ >/dev/null
         fi
     fi
 

From dff42419986c7400a82384629285c86bd42f5a60 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sat, 9 Oct 2010 22:12:51 +0200
Subject: [PATCH 092/214] (testsuite) Fix _filedir test for "compgen -f" hack
 One test was failing on bash-3

---
 test/unit/_filedir.exp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index 59d50854..987df526 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -251,12 +251,7 @@ sync_after_int
 set test "completing f aé should return g when LC_CTYPE=C"
 # Backup/set LC_CTYPE
 assert_bash_exec {OLD_CTYPE=$LC_CTYPE; LC_CTYPE=C}
-if {[lindex $::BASH_VERSINFO 0] > 3} {
-    assert_complete_dir g "f aé/" "fixtures/_filedir"
-} else {
-    assert_complete_dir "\b\b\b\b$'a\\\\303\\\\251/g'" "f aé/" \
-        "fixtures/_filedir"
-}
+assert_complete_dir g "f aé/" "fixtures/_filedir"
 # Restore LC_CTYPE
 assert_bash_exec {[[ $OLD_CTYPE ]] && LC_CTYPE=$OLD_CTYPE || unset LC_CTYPE}
 

From 95399f638cc95dc262a94d845569a12a6a219a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 11 Oct 2010 00:01:51 +0300
Subject: [PATCH 093/214] Fix false posives for non-option words in _parse_help
 (Alioth: #312750, Stephen Gildea).

---
 CHANGES                   |  3 ++
 bash_completion           |  2 +-
 test/unit/_parse_help.exp | 65 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/_parse_help.exp

diff --git a/CHANGES b/CHANGES
index a127231d..de2695a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,9 @@ bash-completion (2.x)
   * Add *.part (partially downloaded) to mplayer and xine-based player
     completions (Alioth: #312657).
 
+  [ Stephen Gildea ]
+  * Fix false posives for non-option words in _parse_help (Alioth: #312750).
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/bash_completion b/bash_completion
index b2b3f1b0..e411ca6a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -677,7 +677,7 @@ _split_longopt()
 #
 _parse_help() {
     $1 ${2:---help} 2>&1 | command grep -- "^[[:space:]]*-" | tr "," " " | \
-        awk '{print $1; if ($2 ~ /-.*/) { print $2 } }' | sed -e "s:=.*::g"
+        awk '{print $1; if ($2 ~ /^-.*/) { print $2 } }' | sed -e "s:=.*::g"
 }
 
 # This function completes on signal names
diff --git a/test/unit/_parse_help.exp b/test/unit/_parse_help.exp
new file mode 100644
index 00000000..c9ced6f6
--- /dev/null
+++ b/test/unit/_parse_help.exp
@@ -0,0 +1,65 @@
+# By Stephen Gildea, October 2010. 
+
+proc setup {} {
+    save_env
+}
+
+proc teardown {} {
+    assert_env_unmodified {
+        /declare -f fn/d
+    }
+}
+
+setup
+
+
+set cmd {fn() { printf '%s\n' ""; }; _parse_help fn}
+assert_bash_list "" $cmd "empty"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "no dashes here"; }; _parse_help fn}
+assert_bash_list "" $cmd "no dashes"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "internal-dash"; }; _parse_help fn}
+assert_bash_list "" $cmd "internal dash 1"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "no -leading-dashes"; }; _parse_help fn}
+assert_bash_list "" $cmd "no leading dash"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "-one dash"; }; _parse_help fn}
+assert_bash_list "-one" $cmd "one dash"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' " -space dash"; }; _parse_help fn}
+assert_bash_list "-space" $cmd "one dash after space"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "-one -two dashes"; }; _parse_help fn}
+assert_bash_list "-one\n-two" $cmd "two dashes, space-separated"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "-one,-t dashes"; }; _parse_help fn}
+assert_bash_list "-one\n-t" $cmd "two dashes, comma-separated"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "-one dash-inside"; }; _parse_help fn}
+assert_bash_list "-one" $cmd "internal dash 2"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "--long-arg=value"; }; _parse_help fn}
+assert_bash_list "--long-arg" $cmd "value stripped"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "--long-arg=-value"; }; _parse_help fn}
+assert_bash_list "--long-arg" $cmd "value not seen as option"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "--long-arg=-value,--opt2=val"; }; _parse_help fn}
+assert_bash_list "--long-arg\n--opt2" $cmd "two options with values"
+sync_after_int
+
+
+teardown

From 52bfcefb3d3870c646273e5d0afa9e392cb37cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 11 Oct 2010 00:14:22 +0300
Subject: [PATCH 094/214] Simplify _parse_help somewhat.

---
 bash_completion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index e411ca6a..d4244a0b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -676,8 +676,8 @@ _split_longopt()
 # @param $2  command options (default: --help)
 #
 _parse_help() {
-    $1 ${2:---help} 2>&1 | command grep -- "^[[:space:]]*-" | tr "," " " | \
-        awk '{print $1; if ($2 ~ /^-.*/) { print $2 } }' | sed -e "s:=.*::g"
+    $1 ${2:---help} 2>&1 | sed -e '/^[[:space:]]*-/!d' -e 's/,/ /g' | \
+        awk '{ print $1; if ($2 ~ /^-/) { print $2 } }' | sed -e 's|=.*||'
 }
 
 # This function completes on signal names

From 96c641630923e8db735316e5a7f4bef8741cadc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 11 Oct 2010 00:39:50 +0300
Subject: [PATCH 095/214] Make _parse_help() work with slash separated options.

---
 CHANGES                   | 4 ++--
 bash_completion           | 2 +-
 test/unit/_parse_help.exp | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index de2695a5..e95f526e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,7 +14,8 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, povray, and sqlite3 completions.
+  * Improve /etc/init.d/*, ipmitool, jar, mencoder, mplayer, povray, sqlite3,
+    and general help parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
@@ -24,7 +25,6 @@ bash-completion (2.x)
   * Make _filedir and _filedir_xspec complete uppercase versions of their
     filename extension arguments in addition to exact case matches.
   * IPv6 known hosts completion fixes (Alioth: #312695, RedHat: #630658).
-  * Improve mplayer and mencoder completions.
   * Fixes to completions for filenames containing tabs (RedHat: #629518).
 
   [ Freddy Vulto ]
diff --git a/bash_completion b/bash_completion
index d4244a0b..451e4261 100644
--- a/bash_completion
+++ b/bash_completion
@@ -676,7 +676,7 @@ _split_longopt()
 # @param $2  command options (default: --help)
 #
 _parse_help() {
-    $1 ${2:---help} 2>&1 | sed -e '/^[[:space:]]*-/!d' -e 's/,/ /g' | \
+    $1 ${2:---help} 2>&1 | sed -e '/^[[:space:]]*-/!d' -e 's|[,/]| |g' | \
         awk '{ print $1; if ($2 ~ /^-/) { print $2 } }' | sed -e 's|=.*||'
 }
 
diff --git a/test/unit/_parse_help.exp b/test/unit/_parse_help.exp
index c9ced6f6..4beb28d2 100644
--- a/test/unit/_parse_help.exp
+++ b/test/unit/_parse_help.exp
@@ -61,5 +61,13 @@ set cmd {fn() { printf '%s\n' "--long-arg=-value,--opt2=val"; }; _parse_help fn}
 assert_bash_list "--long-arg\n--opt2" $cmd "two options with values"
 sync_after_int
 
+set cmd {fn() { printf '%s\n' "-m,--mirror"; }; _parse_help fn}
+assert_bash_list "-m\n--mirror" $cmd "short + long"
+sync_after_int
+
+set cmd {fn() { printf '%s\n' "-T/--upload-file"; }; _parse_help fn}
+assert_bash_list "-T\n--upload-file" $cmd "short + long, slash separated"
+sync_after_int
+
 
 teardown

From 13e811b1f98aa592ef80cca4b66037426db73b75 Mon Sep 17 00:00:00 2001
From: "Andrey G. Grozin" <A.G.Grozin@inp.nsk.su>
Date: Wed, 13 Oct 2010 18:44:47 +0300
Subject: [PATCH 096/214] Add *.fb2 to okular filename completions.

---
 CHANGES         | 3 +++
 bash_completion | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e95f526e..98d6fb5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,9 @@ bash-completion (2.x)
   [ Stephen Gildea ]
   * Fix false posives for non-option words in _parse_help (Alioth: #312750).
 
+  [ Andrey G. Grozin ]
+  * Add *.fb2 to okular filename completions.
+
  -- David Paleino <d.paleino@gmail.com>  Wed, 16 Jun 2010 17:53:22 +0200
 
 bash-completion (1.2)
diff --git a/bash_completion b/bash_completion
index 451e4261..d74e7b79 100644
--- a/bash_completion
+++ b/bash_completion
@@ -87,7 +87,7 @@ complete -f -X '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
 complete -f -X '!*.pdf' acroread gpdf xpdf
 complete -f -X '!*.@(?(e)ps|pdf)' kpdf
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
-complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb|FB|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
+complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
 complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
 complete -f -X '!*.texi*' makeinfo texi2html
 complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi

From 9aeeeec42a20ec221593c6906a472032e6241b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 17 Oct 2010 22:15:50 +0300
Subject: [PATCH 097/214] Add *.m2t to mplayer filename completions (Alioth:
 #312770).

---
 CHANGES             | 4 ++--
 completions/mplayer | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 98d6fb5b..10f81461 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,8 +11,8 @@ bash-completion (2.x)
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
     filefrag, iftop, lrzip, POSIX sh, sysbench, tune2fs, xmodmap, and xrdb
     completions.
-  * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
-    filename completions.
+  * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
+    and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, mencoder, mplayer, povray, sqlite3,
     and general help parsing completions.
diff --git a/completions/mplayer b/completions/mplayer
index 39ac93d3..cd99a76d 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -247,7 +247,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)?(.part)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)?(.part)'
             ;;
     esac
 

From 245486b6df7227b4439dbf12a0e8a41a968b9822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 17 Oct 2010 22:17:38 +0300
Subject: [PATCH 098/214] Add *.m2t and *.m2ts to xine-based player filename
 completions (Alioth: #312770).

---
 CHANGES         | 2 ++
 bash_completion | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 10f81461..56444c22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@ bash-completion (2.x)
     filename extension arguments in addition to exact case matches.
   * IPv6 known hosts completion fixes (Alioth: #312695, RedHat: #630658).
   * Fixes to completions for filenames containing tabs (RedHat: #629518).
+  * Add *.m2t and *.m2ts to xine-based player filename completions
+    (Alioth: #312770).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index d74e7b79..589c2e5a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -92,7 +92,7 @@ complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
 complete -f -X '!*.texi*' makeinfo texi2html
 complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
 complete -f -X '!*.mp3' mpg123 mpg321 madplay
-complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine kaffeine dragon
+complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine kaffeine dragon
 complete -f -X '!*.@(avi|asf|wmv)' aviplay
 complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim

From 37f51b9df201e7944bd4c0f813cc90277c0644a8 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Mon, 18 Oct 2010 22:29:59 +0200
Subject: [PATCH 099/214] (testsuite) Removed changing locale within 'expect'
 Changing the locale within an `expect' session might cause bash to exit. See:
 http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg02265.html

---
 test/lib/library.exp   |  3 ++-
 test/unit/_filedir.exp | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index ffabefcf..c5265cc0 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -568,12 +568,13 @@ proc get_signals {} {
 
 # Initialize tcl globals with bash variables
 proc init_tcl_bash_globals {} {
-    global BASH_VERSINFO BASH_VERSION COMP_WORDBREAKS
+    global BASH_VERSINFO BASH_VERSION COMP_WORDBREAKS LC_CTYPE
     assert_bash_exec {printf "%s" "$COMP_WORDBREAKS"} {} /@ COMP_WORDBREAKS
     assert_bash_exec {printf "%s " "${BASH_VERSINFO[@]}"} "" /@ BASH_VERSINFO
     set BASH_VERSINFO [eval list $BASH_VERSINFO]
     assert_bash_exec {printf "%s" "$BASH_VERSION"} "" /@ BASH_VERSION
     assert_bash_exec {printf "%s" "$TESTDIR"} "" /@ TESTDIR
+    assert_bash_exec {eval $(locale); printf "%s" "$LC_CTYPE"} "" /@ LC_CTYPE
 }
 
 
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index 987df526..a7202b27 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -248,12 +248,11 @@ assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "fixtures/_filedir/ext" $test
 sync_after_int
 
 
-set test "completing f aé should return g when LC_CTYPE=C"
-# Backup/set LC_CTYPE
-assert_bash_exec {OLD_CTYPE=$LC_CTYPE; LC_CTYPE=C}
-assert_complete_dir g "f aé/" "fixtures/_filedir"
-# Restore LC_CTYPE
-assert_bash_exec {[[ $OLD_CTYPE ]] && LC_CTYPE=$OLD_CTYPE || unset LC_CTYPE}
+# Execute this test only when LC_CTYPE matches *UTF-8*
+if {[string first "UTF-8" $::LC_CTYPE] != -1} {
+    set test "completing f aé should return g"
+    assert_complete_dir g "f aé/" "fixtures/_filedir"
+}
 
 
 sync_after_int

From 47b9fbebf2ff0a7222980f313f02a4402c71b3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 11:20:29 +0300
Subject: [PATCH 100/214] Add varirec= to wodim driveropts completions.

---
 CHANGES           | 2 +-
 completions/wodim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 56444c22..575baad5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@ bash-completion (2.x)
     and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, mencoder, mplayer, povray, sqlite3,
-    and general help parsing completions.
+    wodim, and general help parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/wodim b/completions/wodim
index 5fa69a8b..e08ffc65 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -25,7 +25,7 @@ _cdrecord()
                 ;;
             driveropts)
                 COMPREPLY=( $( compgen -W 'burnfree noburnfree\
-                    varirec= audiomaster forcespeed noforcespeed\
+                    varirec= gigarec= audiomaster forcespeed noforcespeed\
                     speedread nospeedread singlesession \
                     nosinglesession hidecdr nohidecdr tattooinfo\
                     tattoofile=' -- "$cur" ) )

From 562b8b3497559951d79c223bebe05f2baaf9107f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 11:22:18 +0300
Subject: [PATCH 101/214] Tweak line wrapping.

---
 completions/wodim | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/completions/wodim b/completions/wodim
index e08ffc65..480936a4 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -18,34 +18,30 @@ _cdrecord()
                 return 0
                 ;;
             blank)
-                COMPREPLY=( $( compgen -W 'help all fast \
-                    track unreserve trtail unclose session' \
-                    -- "$cur" ) )
+                COMPREPLY=( $( compgen -W 'help all fast track unreserve trtail
+                    unclose session' -- "$cur" ) )
                 return 0
                 ;;
             driveropts)
-                COMPREPLY=( $( compgen -W 'burnfree noburnfree\
-                    varirec= gigarec= audiomaster forcespeed noforcespeed\
-                    speedread nospeedread singlesession \
-                    nosinglesession hidecdr nohidecdr tattooinfo\
-                    tattoofile=' -- "$cur" ) )
+                COMPREPLY=( $( compgen -W 'burnfree noburnfree varirec=
+                    gigarec= audiomaster forcespeed noforcespeed speedread
+                    nospeedread singlesession nosinglesession hidecdr nohidecdr
+                    tattooinfo tattoofile=' -- "$cur" ) )
                 return 0
                 ;;
         esac
     fi
 
-    generic_options=(-version -v -V -d -silent -force -immed -dummy \
-        -dao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc \
-        -atip -fix -nofix -waiti -load -lock -eject -format \
-        -setdropts -checkdrive -prcap -inq -scanbus -reset \
-        -abort -overburn -ignsize -useinfo -packet -noclose \
-        -text debug= kdebug= kd= minbuf= speed= blank= fs= \
-        dev= gracetime= timeout= driver= driveropts= \
-        defpregap= pktsize= mcn= textfile= cuefile=)
-    track_options=(-audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi \
-        -isosize -pad padsize= -nopad -shorttrack -noshorttrack\
-        pregap= -preemp -nopreemp -copy -nocopy -scms tcsize= \
-        isrc= index=)
+    generic_options=( -version -v -V -d -silent -force -immed -dummy -dao \
+        -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip -fix -nofix \
+        -waiti -load -lock -eject -format -setdropts -checkdrive -prcap -inq \
+        -scanbus -reset -abort -overburn -ignsize -useinfo -packet -noclose \
+        -text debug= kdebug= kd= minbuf= speed= blank= fs= dev= gracetime= \
+        timeout= driver= driveropts= defpregap= pktsize= mcn= textfile= \
+        cuefile= )
+    track_options=( -audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi \
+        -isosize -pad padsize= -nopad -shorttrack -noshorttrack pregap= \
+        -preemp -nopreemp -copy -nocopy -scms tcsize= isrc= index= )
     # look if previous was either a file or a track option
     track_mode=0
     if [ $COMP_CWORD -gt 1 ]; then

From c0cef5bd44944ddaeb9b8464ba078c96412024c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:29:30 +0300
Subject: [PATCH 102/214] Remove -o filenames for wodim, rely on _filedir doing
 it for us.

---
 completions/wodim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/wodim b/completions/wodim
index 480936a4..04c1ff26 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -69,7 +69,7 @@ _cdrecord()
     fi
 
 } &&
-complete -F _cdrecord -o filenames cdrecord wodim
+complete -F _cdrecord cdrecord wodim
 
 # Local variables:
 # mode: shell-script

From 9e87f134e4aae8f0b0292718be1d0934ead75e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:31:08 +0300
Subject: [PATCH 103/214] Comment spelling fix.

---
 completions/sysbench | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/sysbench b/completions/sysbench
index 7781791e..3b309a9a 100644
--- a/completions/sysbench
+++ b/completions/sysbench
@@ -1,6 +1,6 @@
 # bash completion for sysbench
 
-# We set -o nospace and turn it off in quite a few place for bash < 4
+# We set -o nospace and turn it off in quite a few places for bash < 4
 # reasons; assuming bash >= 4 we could instead not turn it on
 # initially but only in the few cases where it's actually needed.
 

From 7d87ca0a6d3510ccc2528a32d4b3f1686c5d37f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:31:44 +0300
Subject: [PATCH 104/214] Improve wodim foo=bar completions.

---
 completions/wodim | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/completions/wodim b/completions/wodim
index 04c1ff26..763e4737 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -1,35 +1,40 @@
 # bash completion for cdrecord/wodim
 
+# We set -o nospace and turn it off in several places for bash < 4
+# reasons; assuming bash >= 4 we could instead not turn it on
+# initially but only in the few cases where it's actually needed.
+
 have cdrecord || have wodim &&
 _cdrecord()
 {
     local cur prev i generic_options track_options track_mode
 
     COMPREPLY=()
-    _get_comp_words_by_ref cur prev
+    _get_comp_words_by_ref -n = cur prev
 
     # foo=bar style option
     if [[ "$cur" == *=* ]]; then
-        prev=${cur/=*/}
-        cur=${cur/*=/}
+        prev=${cur%%=*}
+        cur=${cur#*=}
         case $prev in
             textfile|cuefile)
+                compopt +o nospace &>/dev/null
                 _filedir
-                return 0
                 ;;
             blank)
+                compopt +o nospace &>/dev/null
                 COMPREPLY=( $( compgen -W 'help all fast track unreserve trtail
                     unclose session' -- "$cur" ) )
-                return 0
                 ;;
             driveropts)
+                compopt +o nospace &>/dev/null
                 COMPREPLY=( $( compgen -W 'burnfree noburnfree varirec=
                     gigarec= audiomaster forcespeed noforcespeed speedread
                     nospeedread singlesession nosinglesession hidecdr nohidecdr
                     tattooinfo tattoofile=' -- "$cur" ) )
-                return 0
                 ;;
         esac
+        return 0
     fi
 
     generic_options=( -version -v -V -d -silent -force -immed -dummy -dao \
@@ -67,9 +72,10 @@ _cdrecord()
         COMPREPLY=( "${COMPREPLY[@]}" \
             $( compgen -W '${generic_options[@]}' -- "$cur" ) )
     fi
-
+    [[ ${#COMPREPLY[@]} == 1 && ${COMPREPLY[0]} != *= ]] && \
+        compopt +o nospace &>/dev/null
 } &&
-complete -F _cdrecord cdrecord wodim
+complete -F _cdrecord -o nospace cdrecord wodim
 
 # Local variables:
 # mode: shell-script

From 7f5cfc3099e1dd9c58049d27d999b2f7d0e8ac14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:36:13 +0300
Subject: [PATCH 105/214] Add wodim driver= completion.

---
 completions/wodim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/completions/wodim b/completions/wodim
index 763e4737..6148667f 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -33,6 +33,11 @@ _cdrecord()
                     nospeedread singlesession nosinglesession hidecdr nohidecdr
                     tattooinfo tattoofile=' -- "$cur" ) )
                 ;;
+            driver)
+                compopt +o nospace &>/dev/null
+                COMPREPLY=( $( compgen -W "$( $1 driver=help 2>&1 | \
+                    awk 'NR > 1 { print $1 }' ) help" -- "$cur" ) )
+                ;;
         esac
         return 0
     fi

From 8ccda052b3b51ab29927b061703b49ed3d90cd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:43:54 +0300
Subject: [PATCH 106/214] Update wodim option lists.

---
 completions/wodim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/completions/wodim b/completions/wodim
index 6148667f..71b1e116 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -42,16 +42,16 @@ _cdrecord()
         return 0
     fi
 
-    generic_options=( -version -v -V -d -silent -force -immed -dummy -dao \
-        -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip -fix -nofix \
-        -waiti -load -lock -eject -format -setdropts -checkdrive -prcap -inq \
-        -scanbus -reset -abort -overburn -ignsize -useinfo -packet -noclose \
-        -text debug= kdebug= kd= minbuf= speed= blank= fs= dev= gracetime= \
-        timeout= driver= driveropts= defpregap= pktsize= mcn= textfile= \
-        cuefile= )
+    generic_options=( -version -v -V -d -silent -force -immed -dummy -clone \
+        -dao -sao -tao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip \
+        -fix -nofix -waiti -load -lock -eject -format -setdropts -checkdrive \
+        -prcap -inq -scanbus --devices -reset -abort -overburn -ignsize \
+        -useinfo -packet -noclose -text debug= kdebug= minbuf= msifile= \
+        speed= blank= fs= ts= dev= gracetime= timeout= driver= driveropts= \
+        defpregap= pktsize= mcn= textfile= cuefile= )
     track_options=( -audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi \
-        -isosize -pad padsize= -nopad -shorttrack -noshorttrack pregap= \
-        -preemp -nopreemp -copy -nocopy -scms tcsize= isrc= index= )
+        -isosize -pad -nopad -shorttrack -noshorttrack -preemp -nopreemp \
+        -copy -nocopy -scms isrc= index= padsize= pregap= tsize= )
     # look if previous was either a file or a track option
     track_mode=0
     if [ $COMP_CWORD -gt 1 ]; then

From 4bcd37d800bcb7cfeb187c78dba64961c3319adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:48:53 +0300
Subject: [PATCH 107/214] Add wodim minbuf= completion.

---
 completions/wodim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/completions/wodim b/completions/wodim
index 71b1e116..0abb6e00 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -38,6 +38,11 @@ _cdrecord()
                 COMPREPLY=( $( compgen -W "$( $1 driver=help 2>&1 | \
                     awk 'NR > 1 { print $1 }' ) help" -- "$cur" ) )
                 ;;
+            minbuf)
+                compopt +o nospace &>/dev/null
+                COMPREPLY=( $( compgen -W "$( seq 25 95 2>/dev/null )" \
+                    -- "$cur" ) )
+                ;;
         esac
         return 0
     fi

From 267c4aad9c6adcfaee801c5f46a9462ba8921c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 12:49:44 +0300
Subject: [PATCH 108/214] Add wodim msifile= completion.

---
 completions/wodim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/wodim b/completions/wodim
index 0abb6e00..434b8066 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -17,7 +17,7 @@ _cdrecord()
         prev=${cur%%=*}
         cur=${cur#*=}
         case $prev in
-            textfile|cuefile)
+            textfile|cuefile|msifile)
                 compopt +o nospace &>/dev/null
                 _filedir
                 ;;

From e7494cf065d1988db6cefad51cd909214e966ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 13:07:21 +0300
Subject: [PATCH 109/214] Add wodim driveropts={varirec,gigarec,tattoofile}=
 completions.

---
 completions/wodim | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/completions/wodim b/completions/wodim
index 434b8066..abc0ff25 100644
--- a/completions/wodim
+++ b/completions/wodim
@@ -27,11 +27,33 @@ _cdrecord()
                     unclose session' -- "$cur" ) )
                 ;;
             driveropts)
-                compopt +o nospace &>/dev/null
-                COMPREPLY=( $( compgen -W 'burnfree noburnfree varirec=
-                    gigarec= audiomaster forcespeed noforcespeed speedread
-                    nospeedread singlesession nosinglesession hidecdr nohidecdr
-                    tattooinfo tattoofile=' -- "$cur" ) )
+                if [[ $cur == *=* ]]; then
+                    prev=${cur%%=*}
+                    cur=${cur#*=}
+                    case $prev in
+                        varirec)
+                            compopt +o nospace &>/dev/null
+                            COMPREPLY=( $( compgen -W "-2 -1 0 1 2" \
+                                -- "$cur" ) )
+                            ;;
+                        gigarec)
+                            compopt +o nospace &>/dev/null
+                            COMPREPLY=( $( compgen -W "0.6 0.7 0.8 1.0 1.2 1.3
+                                1.4" -- "$cur" ) )
+                            ;;
+                        tattoofile)
+                            compopt +o nospace &>/dev/null
+                            _filedir
+                            ;;
+                    esac
+                else
+                    COMPREPLY=( $( compgen -W 'burnfree noburnfree varirec=
+                        gigarec= audiomaster forcespeed noforcespeed speedread
+                        nospeedread singlesession nosinglesession hidecdr
+                        nohidecdr tattooinfo tattoofile=' -- "$cur" ) )
+                    [[ ${#COMPREPLY[@]} == 1 && ${COMPREPLY[0]} != *= ]] && \
+                        compopt +o nospace &>/dev/null
+                fi
                 ;;
             driver)
                 compopt +o nospace &>/dev/null

From 75b232ad3f0e85bbde5c7753f6382fb79d9d2458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 13:32:37 +0300
Subject: [PATCH 110/214] Indentation/line wrapping fixes.

---
 completions/rpm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/completions/rpm b/completions/rpm
index 0dbcd048..ee56af8e 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -118,9 +118,9 @@ _rpm()
                 _filedir
             else
                 # complete on capabilities
-            local IFS=$'\n'
-            COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                --queryformat='%{providename}\n' )" -- "$cur" ) )
+                local IFS=$'\n'
+                COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
+                    --queryformat='%{providename}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;
@@ -131,8 +131,7 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n'
                 COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                        --queryformat='%{requirename}\n' )" \
-                        -- "$cur" ) )
+                        --queryformat='%{requirename}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;
@@ -279,7 +278,8 @@ _rpm()
             ;;
         --import|--dbpath|--root)
             if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--import --dbpath --root' -- "$cur" ) )
+                COMPREPLY=( $( compgen -W '--import --dbpath --root' \
+                    -- "$cur" ) )
             else
                 _filedir
             fi

From 57720ee0be09ace405942313aeb6c3a3b90b45d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 14:15:32 +0300
Subject: [PATCH 111/214] Treat --*path* like --*file* in _longopt().

---
 bash_completion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index 589c2e5a..2a0124a5 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1491,10 +1491,10 @@ _longopt()
 
     if _split_longopt; then
         case "$prev" in
-            *[Dd][Ii][Rr]*)
+            --*[Dd][Ii][Rr]*)
                 _filedir -d
                 ;;
-            *[Ff][Ii][Ll][Ee]*)
+            --*[Ff][Ii][Ll][Ee]*|--*[Pp][Aa][Tt][Hh]*)
                 _filedir
                 ;;
         esac

From 768bbc7858202cb28ff97b155bfd24e568b44f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 14:17:49 +0300
Subject: [PATCH 112/214] Turn on -o filenames automatically also with _filedir
 -d.

---
 bash_completion | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bash_completion b/bash_completion
index 2a0124a5..410ecef0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -642,12 +642,12 @@ _filedir()
             xspec=${1:+"!*.@($1|${1^^})"} || \
             xspec=${1:+"!*.@($1|$(printf %s $1 | tr '[:lower:]' '[:upper:]'))"}
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
-        if [ ${#toks[@]} -ne 0 ]; then
-            # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
-            # info about the compgen hack (bash < 4)
-            compopt -o filenames 2>/dev/null || \
-                compgen -f /non-existing-dir/ >/dev/null
-        fi
+    fi
+    if [ ${#toks[@]} -ne 0 ]; then
+        # Turn on -o filenames; see http://bugs.debian.org/272660#64 for info
+        # about the compgen hack (bash < 4)
+        compopt -o filenames 2>/dev/null || \
+            compgen -f /non-existing-dir/ >/dev/null
     fi
 
     COMPREPLY=( "${COMPREPLY[@]}" "${toks[@]}" )

From d51ad46cd29d7bf09bdd883ad0aa6e7a2e4aba47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 14:27:15 +0300
Subject: [PATCH 113/214] Improve _longopt --*=, --*dir*, --*file*, and
 --*path* completions.

---
 bash_completion | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bash_completion b/bash_completion
index 410ecef0..fe99f904 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1485,21 +1485,23 @@ complete -F _root_command -o filenames sudo fakeroot really gksudo gksu kdesudo
 
 _longopt()
 {
-    local cur prev
+    local cur prev split=false
+    _get_comp_words_by_ref -n = cur prev
 
-    _get_comp_words_by_ref cur prev
+    _split_longopt && split=true
 
-    if _split_longopt; then
-        case "$prev" in
-            --*[Dd][Ii][Rr]*)
-                _filedir -d
-                ;;
-            --*[Ff][Ii][Ll][Ee]*|--*[Pp][Aa][Tt][Hh]*)
-                _filedir
-                ;;
-        esac
-        return 0
-    fi
+    case "$prev" in
+        --*[Dd][Ii][Rr]*)
+            _filedir -d
+            return 0
+            ;;
+        --*[Ff][Ii][Ll][Ee]*|--*[Pp][Aa][Tt][Hh]*)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    $split && return 0
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \

From 049e32ae665a22a0e8c5e88509a5f5f40e867266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 14:35:25 +0300
Subject: [PATCH 114/214] Add dirs-only rmdir test case.

---
 test/lib/completions/rmdir.exp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/lib/completions/rmdir.exp b/test/lib/completions/rmdir.exp
index cc604761..6452b4bb 100644
--- a/test/lib/completions/rmdir.exp
+++ b/test/lib/completions/rmdir.exp
@@ -17,4 +17,10 @@ assert_complete_any "rmdir "
 sync_after_int
 
 
+assert_complete {"bar bar.d/" foo.d/} "rmdir fixtures/shared/default/"
+
+
+sync_after_int
+
+
 teardown

From 1b248b55021318e653a0ca81145829c9dc77c97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 14:36:11 +0300
Subject: [PATCH 115/214] Make mkdir complete only on dirs.

---
 CHANGES                        | 4 ++--
 bash_completion                | 2 +-
 test/lib/completions/mkdir.exp | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 575baad5..b2abbc6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,8 +14,8 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, mencoder, mplayer, povray, sqlite3,
-    wodim, and general help parsing completions.
+  * Improve /etc/init.d/*, ipmitool, jar, mencoder, mkdir, mplayer, povray,     
+    sqlite3, wodim, and general help parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/bash_completion b/bash_completion
index fe99f904..24c9d3f2 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1507,7 +1507,7 @@ _longopt()
         COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \
             sed -ne 's/.*\(--[-A-Za-z0-9]\{1,\}\).*/\1/p' | sort -u )" \
             -- "$cur" ) )
-    elif [[ "$1" == rmdir ]]; then
+    elif [[ "$1" == @(mk|rm)dir ]]; then
         _filedir -d
     else
         _filedir
diff --git a/test/lib/completions/mkdir.exp b/test/lib/completions/mkdir.exp
index a9333564..4fc7b800 100644
--- a/test/lib/completions/mkdir.exp
+++ b/test/lib/completions/mkdir.exp
@@ -17,4 +17,10 @@ assert_complete_any "mkdir "
 sync_after_int
 
 
+assert_complete {"bar bar.d/" foo.d/} "mkdir fixtures/shared/default/"
+
+
+sync_after_int
+
+
 teardown

From 4c8ff90ab750c68aedf21c4af6a9f68cc155b2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 15:18:13 +0300
Subject: [PATCH 116/214] Coding style tweaks.

---
 completions/_subversion | 471 +++++++++++++++++-----------------------
 1 file changed, 201 insertions(+), 270 deletions(-)

diff --git a/completions/_subversion b/completions/_subversion
index 06adf830..4ffe1eae 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -30,22 +30,22 @@ _svn()
         case $prev in
             --config-dir)
                 _filedir -d
-                return 0;
+                return 0
                 ;;
             -F|--file|--targets)
                 _filedir
-                return 0;
+                return 0
                 ;;
             --encoding)
                 COMPREPLY=( $( compgen -W '$( iconv --list | \
                     sed -e "s@//@@;" )' -- "$cur" ) )
-                return 0;
+                return 0
                 ;;
             --editor-cmd|--diff-cmd|--diff3-cmd)
                 COMP_WORDS=(COMP_WORDS[0] $cur)
                 COMP_CWORD=1
                 _command
-                return 0;
+                return 0
                 ;;
         esac
 
@@ -55,172 +55,125 @@ _svn()
             # possible options for the command
             case $command in
                 add)
-                    options='--auto-props --no-auto-props \
-                                                --force --targets --no-ignore \
-                                                --non-recursive -N -q --quiet'
+                    options='--auto-props --no-auto-props --force --targets
+                             --no-ignore --non-recursive -N -q --quiet'
                     ;;
                 blame|annotate|ann|praise)
-                    options='-r --revisions --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive -v \
-                                                --verbose --incremental --xml'
+                    options='-r --revisions --username --password
+                             --no-auth-cache --non-interactive -v --verbose
+                             --incremental --xml'
                     ;;
                 cat)
-                    options='-r --revision --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='-r --revision --username --password
+                             --no-auth-cache --non-interactive'
                     ;;
                 checkout|co)
-                    options='-r --revision -q --quiet -N \
-                                                --non-recursive --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive \
-                                                --ignore-externals'
+                    options='-r --revision -q --quiet -N --non-recursive
+                             --username --password --no-auth-cache
+                             --non-interactive --ignore-externals'
                     ;;
                 cleanup)
                     options='--diff3-cmd'
                     ;;
                 commit|ci)
-                    options='-m --message -F --file \
-                                                --encoding --force-log -q \
-                                                --quiet --non-recursive -N \
-                                                --targets --editor-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive --no-unlock'
+                    options='-m --message -F --file --encoding --force-log -q
+                             --quiet --non-recursive -N --targets --editor-cmd
+                             --username --password --no-auth-cache
+                             --non-interactive --no-unlock'
                     ;;
                 copy|cp)
-                    options='-m --message -F --file \
-                                                --encoding --force-log -r \
-                                                --revision -q --quiet \
-                                                --editor-cmd -username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='-m --message -F --file --encoding --force-log -r
+                             --revision -q --quiet --editor-cmd -username
+                             --password --no-auth-cache --non-interactive'
                     ;;
                 delete|del|remove|rm)
-                    options='--force -m --message -F \
-                                                --file --encoding --force-log \
-                                                -q --quiet --targets \
-                                                --editor-cmd -username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='--force -m --message -F --file --encoding
+                             --force-log -q --quiet --targets --editor-cmd
+                             --username --password --no-auth-cache
+                             --non-interactive'
                     ;;
                 diff|di)
-                    options='-r --revision -x --extensions \
-                                                --diff-cmd --no-diff-deleted \
-                                                -N --non-recursive --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive --force \
-                                                --old --new --notice-ancestry'
+                    options='-r --revision -x --extensions --diff-cmd
+                             --no-diff-deleted -N --non-recursive --username
+                             --password --no-auth-cache --non-interactive
+                             --force --old --new --notice-ancestry'
                     ;;
                 export)
-                    options='-r --revision -q --quiet \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive -N \
-                                                --non-recursive --force \
-                                                --native-eol --ignore-externals'
+                    options='-r --revision -q --quiet --username --password
+                             --no-auth-cache --non-interactive -N
+                             --non-recursive --force --native-eol
+                             --ignore-externals'
                     ;;
                 import)
-                    options='--auto-props --no-auto-props \
-                                                -m --message -F --file \
-                                                --encoding --force-log -q \
-                                                --quiet --non-recursive \
-                                                --no-ignore --editor-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive'
+                    options='--auto-props --no-auto-props -m --message -F
+                             --file --encoding --force-log -q --quiet
+                             --non-recursive --no-ignore --editor-cmd
+                             --username --password --no-auth-cache
+                             --non-interactive'
                     ;;
                 info)
-                    options='--username --password \
-                                                --no-auth-cache \
-                                                --non-interactive -r \
-                                                --revision --xml --targets \
-                                                -R --recursive --incremental'
+                    options='--username --password --no-auth-cache
+                             --non-interactive -r --revision --xml --targets
+                             -R --recursive --incremental'
                     ;;
                 list|ls)
-                    options='-r --revision -v --verbose -R \
-                                                --recursive --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive \
-                                                --incremental --xml'
+                    options='-r --revision -v --verbose -R --recursive
+                             --username --password --no-auth-cache
+                             --non-interactive --incremental --xml'
                     ;;
                 lock)
-                    options='-m --message -F --file \
-                                                --encoding --force-log \
-                                                --targets --force --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='-m --message -F --file --encoding --force-log
+                             --targets --force --username --password
+                             --no-auth-cache --non-interactive'
                     ;;
                 log)
-                    options='-r --revision -v --verbose \
-                                                --targets --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive \
-                                                --stop-on-copy --incremental \
-                                                --xml -q --quiet --limit'
-                                        ;;
+                    options='-r --revision -v --verbose --targets --username
+                             --password --no-auth-cache --non-interactive
+                             --stop-on-copy --incremental --xml -q --quiet
+                             --limit'
+                    ;;
                 merge)
-                    options='-r --revision -N \
-                                                --non-recursive -q --quiet \
-                                                --force --dry-run --diff3-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive \
-                                                --ignore-ancestry'
+                    options='-r --revision -N --non-recursive -q --quiet
+                             --force --dry-run --diff3-cmd --username
+                             --password --no-auth-cache --non-interactive
+                             --ignore-ancestry'
                     ;;
                 mkdir)
-                    options='-m --message -F --file \
-                                                --encoding --force-log -q \
-                                                --quiet --editor-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive'
+                    options='-m --message -F --file --encoding --force-log -q
+                             --quiet --editor-cmd --username --password
+                             --no-auth-cache --non-interactive'
                     ;;
                 move|mv|rename|ren)
-                    options='-m --message -F --file \
-                                                --encoding --force-log -r \
-                                                --revision -q --quiet \
-                                                --force --editor-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive'
+                    options='-m --message -F --file --encoding --force-log -r
+                             --revision -q --quiet --force --editor-cmd
+                             --username --password --no-auth-cache
+                             --non-interactive'
                     ;;
                 propdel|pdel|pd)
-                    options='-q --quiet -R --recursive -r \
-                                                --revision --revprop \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive'
+                    options='-q --quiet -R --recursive -r --revision --revprop
+                             --username --password --no-auth-cache
+                             --non-interactive'
                     ;;
                 propedit|pedit|pe)
-                    options='-r --revision --revprop \
-                                                --encoding --editor-cmd \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive --force'
+                    options='-r --revision --revprop --encoding --editor-cmd
+                             --username --password --no-auth-cache
+                             --non-interactive --force'
                     ;;
                 propget|pget|pg)
-                    options='-R --recursive -r --revision \
-                                                --revprop --strict --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='-R --recursive -r --revision --revprop --strict
+                             --username --password --no-auth-cache
+                             --non-interactive'
                     ;;
                 proplist|plist|pl)
-                    options='-v --verbose -R --recursive \
-                                                -r --revision --revprop -q \
-                                                --quiet --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive'
+                    options='-v --verbose -R --recursive -r --revision
+                             --revprop -q --quiet --username --password
+                             --no-auth-cache --non-interactive'
                     ;;
                 propset|pset|ps)
-                    options='-F --file -q --quiet \
-                                                --targets -R --recursive \
-                                                --revprop --encoding \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive -r \
-                                                --revision --force'
+                    options='-F --file -q --quiet --targets -R --recursive
+                             --revprop --encoding --username --password
+                             --no-auth-cache --non-interactive -r --revision
+                             --force'
                     ;;
                 resolved)
                     options='--targets -R --recursive -q --quiet'
@@ -229,33 +182,24 @@ _svn()
                     options='--targets -R --recursive -q --quiet'
                     ;;
                 status|stat|st)
-                    options='-u --show-updates -v \
-                                                --verbose -N --non-recursive \
-                                                -q --quiet --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive --no-ignore \
-                                                --ignore-externals \
-                                                --incremental --xml'
+                    options='-u --show-updates -v --verbose -N --non-recursive
+                             -q --quiet --username --password --no-auth-cache
+                             --non-interactive --no-ignore --ignore-externals
+                             --incremental --xml'
                     ;;
                 switch|sw)
-                    options='--relocate -r --revision -N \
-                                                --non-recursive -q --quiet \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive --diff3-cmd'
+                    options='--relocate -r --revision -N --non-recursive -q
+                             --quiet --username --password --no-auth-cache
+                             --non-interactive --diff3-cmd'
                     ;;
                 unlock)
-                    options='--targets --force --username \
-                                                --password --no-auth-cache \
-                                                --non-interactive'
+                    options='--targets --force --username --password
+                             --no-auth-cache --non-interactive'
                     ;;
                 update|up)
-                    options='-r --revision -N \
-                                                --non-recursive -q --quiet \
-                                                --username --password \
-                                                --no-auth-cache \
-                                                --non-interactive \
-                                                --diff3-cmd --ignore-externals'
+                    options='-r --revision -N --non-recursive -q --quiet
+                             --username --password --no-auth-cache
+                             --non-interactive --diff3-cmd --ignore-externals'
                     ;;
             esac
             options="$options --help -h --config-dir"
@@ -276,146 +220,133 @@ complete -F _svn -o filenames svn
 
 _svnadmin()
 {
-        local cur prev commands options mode
+    local cur prev commands options mode
 
-        COMPREPLY=()
-        _get_comp_words_by_ref cur prev
+    COMPREPLY=()
+    _get_comp_words_by_ref cur prev
 
-        commands='create deltify dump help ? hotcopy list-dblogs \
-                list-unused-dblogs load lslocks lstxns recover rmlocks \
-                rmtxns setlog verify'
+    commands='create deltify dump help ? hotcopy list-dblogs list-unused-dblogs
+              load lslocks lstxns recover rmlocks rmtxns setlog verify'
 
-        if [[ $COMP_CWORD -eq 1 ]] ; then
-                if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--version' -- $cur ) )
-                else
-                        COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
-                fi
+    if [[ $COMP_CWORD -eq 1 ]] ; then
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '--version' -- $cur ) )
         else
-                case $prev in
-                        --config-dir)
-                                _filedir -d
-                                return 0;
-                                ;;
-                        --fs-type)
-                                COMPREPLY=( $( compgen -W 'fsfs bdb' -- $cur ) )
-                                return 0;
-                                ;;
-                esac
-
-                command=${COMP_WORDS[1]}
-
-                if [[ "$cur" == -* ]]; then
-                        # possible options for the command
-                        case $command in
-                                create)
-                                        options='--bdb-txn-nosync \
-                                                --bdb-log-keep --config-dir \
-                                                --fs-type'
-                                        ;;
-                                deltify)
-                                        options='-r --revision -q --quiet'
-                                        ;;
-                                dump)
-                                        options='-r --revision --incremental \
-                                                -q --quiet --deltas'
-                                        ;;
-                                hotcopy)
-                                        options='--clean-logs'
-                                        ;;
-                                load)
-                                        options='--ignore-uuid --force-uuid \
-                                                --parent-dir -q --quiet \
-                                                --use-pre-commit-hook \
-                                                --use-post-commit-hook'
-                                        ;;
-                                rmtxns)
-                                        options='-q --quiet'
-                                        ;;
-                                setlog)
-                                        options='-r --revision --bypass-hooks'
-                                        ;;
-                        esac
-
-                        options="$options --help -h"
-                        COMPREPLY=( $( compgen -W "$options" -- $cur ) )
-                else
-                        if [[ "$command" == @(help|h|\?) ]]; then
-                                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
-                        else
-                                _filedir
-                        fi
-                fi
+            COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
         fi
+    else
+        case $prev in
+            --config-dir)
+                _filedir -d
+                return 0
+                ;;
+            --fs-type)
+                COMPREPLY=( $( compgen -W 'fsfs bdb' -- $cur ) )
+                return 0
+                ;;
+        esac
 
-        return 0
+        command=${COMP_WORDS[1]}
+
+        if [[ "$cur" == -* ]]; then
+            # possible options for the command
+            case $command in
+                create)
+                    options='--bdb-txn-nosync --bdb-log-keep --config-dir
+                             --fs-type'
+                    ;;
+                deltify)
+                    options='-r --revision -q --quiet'
+                    ;;
+                dump)
+                    options='-r --revision --incremental -q --quiet --deltas'
+                    ;;
+                hotcopy)
+                    options='--clean-logs'
+                    ;;
+                load)
+                    options='--ignore-uuid --force-uuid --parent-dir -q --quiet
+                             --use-pre-commit-hook --use-post-commit-hook'
+                    ;;
+                rmtxns)
+                    options='-q --quiet'
+                    ;;
+                setlog)
+                    options='-r --revision --bypass-hooks'
+                    ;;
+            esac
+
+            options="$options --help -h"
+            COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+        else
+            if [[ "$command" == @(help|h|\?) ]]; then
+                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+            else
+                _filedir
+            fi
+        fi
+    fi
+
+    return 0
 }
 complete -F _svnadmin -o default svnadmin
 
 _svnlook()
 {
-        local cur prev commands options mode
+    local cur prev commands options mode
 
-        COMPREPLY=()
-        _get_comp_words_by_ref cur
+    COMPREPLY=()
+    _get_comp_words_by_ref cur
 
-        commands='author cat changed date diff dirs-changed help ? h history \
-                info lock log propget pget pg proplist plist pl tree uuid \
-                youngest'
+    commands='author cat changed date diff dirs-changed help ? h history info
+              lock log propget pget pg proplist plist pl tree uuid youngest'
 
-        if [[ $COMP_CWORD -eq 1 ]] ; then
-                if [[ "$cur" == -* ]]; then
-                        COMPREPLY=( $( compgen -W '--version' -- $cur ) )
-                else
-                        COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
-                fi
+    if [[ $COMP_CWORD -eq 1 ]] ; then
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '--version' -- $cur ) )
         else
-                command=${COMP_WORDS[1]}
-
-                if [[ "$cur" == -* ]]; then
-                        # possible options for the command
-                        case $command in
-                                author|cat|date|dirs-changed|info|log)
-                                        options='-r --revision -t \
-                                                --transaction'
-                                        ;;
-                                changed)
-                                        options='-r --revision -t \
-                                                --transaction --copy-info'
-                                        ;;
-                                diff)
-                                        options='-r --revision -t \
-                                                --transaction \
-                                                --no-diff-deleted \
-                                                --no-diff-added \
-                                                --diff-copy-from'
-                                        ;;
-                                history)
-                                        options='-r --revision --show-ids'
-                                        ;;
-                                propget|proplist)
-                                        options='-r --revision -t \
-                                                --transaction --revprop'
-                                        ;;
-                                tree)
-                                        options='-r --revision -t \
-                                                --transaction --show-ids \
-                                                --full-paths'
-                                        ;;
-                        esac
-
-                        options="$options --help -h"
-                        COMPREPLY=( $( compgen -W "$options" -- $cur ) )
-                else
-                        if [[ "$command" == @(help|h|\?) ]]; then
-                                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
-                        else
-                                _filedir
-                        fi
-                fi
+            COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
         fi
+    else
+        command=${COMP_WORDS[1]}
 
-        return 0
+        if [[ "$cur" == -* ]]; then
+            # possible options for the command
+            case $command in
+                author|cat|date|dirs-changed|info|log)
+                    options='-r --revision -t --transaction'
+                    ;;
+                changed)
+                    options='-r --revision -t --transaction --copy-info'
+                    ;;
+                diff)
+                    options='-r --revision -t --transaction --no-diff-deleted
+                             --no-diff-added --diff-copy-from'
+                    ;;
+                history)
+                    options='-r --revision --show-ids'
+                    ;;
+                propget|proplist)
+                    options='-r --revision -t --transaction --revprop'
+                    ;;
+                tree)
+                    options='-r --revision -t --transaction --show-ids
+                             --full-paths'
+                    ;;
+            esac
+
+            options="$options --help -h"
+            COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+        else
+            if [[ "$command" == @(help|h|\?) ]]; then
+                COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+            else
+                _filedir
+            fi
+        fi
+    fi
+
+    return 0
 }
 complete -F _svnlook -o default svnlook
 }

From 1017b24212af1fedf4f964e426ed2821fc60adb3 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sat, 23 Oct 2010 20:49:02 +0200
Subject: [PATCH 117/214] (testsuite) Fix eof/timeout message when unknown
 level

---
 test/config/default.exp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/config/default.exp b/test/config/default.exp
index 029f11d5..53e0185e 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -3,17 +3,21 @@ expect_after {
     eof {
         if {[info exists test]} {
             fail "$test at eof" 
-        } else {
+        } elseif {[info level] > 0} {
             fail "[info level 1] at eof" 
-        }
-    }
+        } else {
+            fail "eof"
+        }   
+    }   
     timeout {
         if {[info exists test]} {
             fail "$test at timeout" 
-        } else {
+        } elseif {[info level] > 0} {
             fail "[info level 1] at timeout" 
-        }
-    }
+        } else {
+            fail "timeout" 
+        }   
+    }   
 }
 
 

From b31530f125689ccb18375536593fb5a73e67afb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 19:46:57 +0300
Subject: [PATCH 118/214] Add *.tar to rpmbuild -tb filename completions.

---
 CHANGES         | 2 +-
 completions/rpm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index b2abbc6d..b75b8216 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@ bash-completion (2.x)
     and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, mencoder, mkdir, mplayer, povray,     
-    sqlite3, wodim, and general help parsing completions.
+    rpmbuild, sqlite3, wodim, and general help parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/rpm b/completions/rpm
index ee56af8e..9bd19f68 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -248,7 +248,7 @@ _rpm()
             elif [[ ${COMP_WORDS[1]} == -b* ]]; then
                 _filedir spec
             else
-                _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar.@(lzma|Z))'
+                _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar?(.@(lzma|Z)))'
             fi
             ;;
         --rebuild|--recompile)
@@ -260,7 +260,7 @@ _rpm()
             fi
             ;;
         --tarbuild)
-            _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar.@(lzma|Z))'
+            _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar?(.@(lzma|Z)))'
             ;;
         --resign|--addsign)
             _filedir '[rs]pm'

From 5d7a13e05b2cab304c2bedfa924c56e35ae0780d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 21:42:00 +0300
Subject: [PATCH 119/214] Complete MAC addresses also from /etc/ethers.

---
 CHANGES         | 1 +
 bash_completion | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index b75b8216..6c0b4ed6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ bash-completion (2.x)
   * Fixes to completions for filenames containing tabs (RedHat: #629518).
   * Add *.m2t and *.m2ts to xine-based player filename completions
     (Alioth: #312770).
+  * Add /etc/ethers to MAC address completion sources.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 24c9d3f2..81ec62a9 100644
--- a/bash_completion
+++ b/bash_completion
@@ -712,6 +712,10 @@ _mac_addresses()
         "s/.*[[:space:]]\($re\)[[:space:]].*/\1/p" -ne \
         "s/.*[[:space:]]\($re\)[[:space:]]*$/\1/p" ) )
 
+    # /etc/ethers
+    COMPREPLY=( "${COMPREPLY[@]}" $( sed -ne \
+        "s/^[[:space:]]*\($re\)[[:space:]].*/\1/p" /etc/ethers 2>/dev/null ) )
+
     COMPREPLY=( $( compgen -W '${COMPREPLY[@]}' -- "$cur" ) )
     __ltrim_colon_completions "$cur"
 }

From 0f3a7ff2a57c89d489e86eecbc0dedc64b7c4703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 23:01:11 +0300
Subject: [PATCH 120/214] Make man completion work with manpage names
 containing colons.

For example Perl module man pages often contain them.  While at it,
add a couple of unrelated man test cases.
---
 CHANGES                                        |  4 ++--
 completions/man                                |  3 ++-
 test/fixtures/man/man1/bar.1.bz2               |  0
 test/fixtures/man/man1/foo.1                   |  0
 test/fixtures/man/man3/Bash::Completion.3pm.gz |  0
 test/lib/completions/man.exp                   | 15 ++++++++++++++-
 6 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/man/man1/bar.1.bz2
 create mode 100644 test/fixtures/man/man1/foo.1
 create mode 100644 test/fixtures/man/man3/Bash::Completion.3pm.gz

diff --git a/CHANGES b/CHANGES
index 6c0b4ed6..1a28407a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,8 +14,8 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, mencoder, mkdir, mplayer, povray,     
-    rpmbuild, sqlite3, wodim, and general help parsing completions.
+  * Improve /etc/init.d/*, ipmitool, jar, man, mencoder, mkdir, mplayer,
+    povray, rpmbuild, sqlite3, wodim, and general help parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/man b/completions/man
index a3360b2e..0cf3e2ed 100644
--- a/completions/man
+++ b/completions/man
@@ -11,7 +11,7 @@ _man()
     mansect="@([0-9lnp]|[0-9][px]|3pm)"
 
     COMPREPLY=()
-    _get_comp_words_by_ref cur prev
+    _get_comp_words_by_ref -n : cur prev
 
     if [[ "$prev" == -l ]]; then
         _filedir $manext
@@ -66,6 +66,7 @@ _man()
         done
     fi
 
+    __ltrim_colon_completions "$cur"
     return 0
 }
 [ $USERLAND = GNU -o $UNAME = Darwin \
diff --git a/test/fixtures/man/man1/bar.1.bz2 b/test/fixtures/man/man1/bar.1.bz2
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/man/man1/foo.1 b/test/fixtures/man/man1/foo.1
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/man/man3/Bash::Completion.3pm.gz b/test/fixtures/man/man3/Bash::Completion.3pm.gz
new file mode 100644
index 00000000..e69de29b
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index 47a6575f..e0056ca2 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -1,4 +1,5 @@
 proc setup {} {
+    assert_bash_exec {export MANPATH=$TESTDIR/fixtures/man}
     save_env
 }
 
@@ -11,7 +12,19 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "man man"
+assert_complete "bar" "man b"
+
+
+sync_after_int
+
+
+assert_complete "fixtures/man/man1/foo.1" "man fixtures/man/man1/f"
+
+
+sync_after_int
+
+
+assert_complete "Bash::Completion" "man Bash::C"
 
 
 sync_after_int

From 1b13f96ff5d0386a56fef996dde3fb04bc8fc390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 23 Oct 2010 23:05:56 +0300
Subject: [PATCH 121/214] Remove redundant code.

---
 completions/man | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/completions/man b/completions/man
index 0cf3e2ed..6918fb41 100644
--- a/completions/man
+++ b/completions/man
@@ -68,10 +68,7 @@ _man()
 
     __ltrim_colon_completions "$cur"
     return 0
-}
-[ $USERLAND = GNU -o $UNAME = Darwin \
-  -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
-  -o $UNAME = OpenBSD ] && \
+} &&
 complete -F _man -o filenames man apropos whatis
 
 # Local variables:

From cf882a49e2fd9b53464e7a1e94f311f7a678d7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 12:37:22 +0300
Subject: [PATCH 122/214] Coding style tweaks.

---
 completions/_mock   | 19 +++++++++----------
 completions/dd      | 26 +++++++++++++-------------
 completions/dselect |  1 -
 completions/postfix |  6 +++---
 completions/python  |  2 --
 completions/sbcl    |  8 ++++----
 completions/shadow  |  9 ++++++---
 7 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/completions/_mock b/completions/_mock
index 40e422ce..c1888ed1 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -27,7 +27,8 @@ _mock()
     _split_longopt && split=true
 
     case $prev in
-        -h|--help|--copyin|--copyout|--arch|-D|--define|--with|--without|--uniqueext|--rpmbuild_timeout|--sources|--cwd)
+        -h|--help|--copyin|--copyout|--arch|-D|--define|--with|--without|\
+        --uniqueext|--rpmbuild_timeout|--sources|--cwd)
             return 0
             ;;
         -r|--root)
@@ -62,15 +63,13 @@ _mock()
     $split && return 0
 
     if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version --help --rebuild \
-            --buildsrpm --shell --chroot --clean --init \
-            --installdeps --install --update --orphanskill \
-            --copyin --copyout --root --offline --no-clean \
-            --cleanup-after --no-cleanup-after --arch --target \
-            --define --with --without --resultdir --uniqueext \
-            --configdir --rpmbuild_timeout --unpriv --cwd --spec \
-            --sources --verbose --quiet --trace --enable-plugin \
-            --disable-plugin --print-root-path' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--version --help --rebuild --buildsrpm
+            --shell --chroot --clean --init --installdeps --install --update
+            --orphanskill --copyin --copyout --root --offline --no-clean
+            --cleanup-after --no-cleanup-after --arch --target --define --with
+            --without --resultdir --uniqueext --configdir --rpmbuild_timeout
+            --unpriv --cwd --spec --sources --verbose --quiet --trace
+            --enable-plugin --disable-plugin --print-root-path' -- "$cur" ) )
     else
         _filedir '@(?(no)src.r|s)pm'
     fi
diff --git a/completions/dd b/completions/dd
index e236f85a..5b952b4f 100644
--- a/completions/dd
+++ b/completions/dd
@@ -9,24 +9,24 @@ _dd()
     _get_comp_words_by_ref -n = cur
 
     case $cur in
-    if=*|of=*)
-        cur=${cur#*=}
-        _filedir
-        return 0
-        ;;
-    conv=*)
-        cur=${cur#*=}
-        COMPREPLY=( $( compgen -W 'ascii ebcdic ibm block unblock \
-            lcase notrunc ucase swab noerror sync' -- "$cur" ) )
-        return 0
-        ;;
+        if=*|of=*)
+            cur=${cur#*=}
+            _filedir
+            return 0
+            ;;
+        conv=*)
+            cur=${cur#*=}
+            COMPREPLY=( $( compgen -W 'ascii ebcdic ibm block unblock lcase
+                notrunc ucase swab noerror sync' -- "$cur" ) )
+            return 0
+            ;;
     esac
 
     _expand || return 0
 
     COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) \
-                $( compgen -W 'bs cbs conv count ibs if obs of seek skip'\
-                -S '=' -- "$cur" ) )
+                $( compgen -W 'bs cbs conv count ibs if obs of seek skip' \
+                           -S '=' -- "$cur" ) )
 } &&
 complete -F _dd -o nospace -o filenames dd
 
diff --git a/completions/dselect b/completions/dselect
index 8bea891a..e33e5bd1 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -27,7 +27,6 @@ _dselect()
             remove quit' -- "$cur" ) )
     fi
 
-
     return 0
 } &&
 complete -F _dselect -o filenames dselect
diff --git a/completions/postfix b/completions/postfix
index ec91c1a3..d9de61dc 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -51,13 +51,13 @@ _postmap()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '-N -f -i -n -o -p -r -v -w -c -d -q'\
+        COMPREPLY=( $( compgen -W '-N -f -i -n -o -p -r -v -w -c -d -q' \
             -- "$cur" ) )
         return 0
     fi
 
     if [[ "$cur" == *:* ]]; then
-            COMPREPLY=( $( compgen -f -- "${cur#*:}" ) )
+        COMPREPLY=( $( compgen -f -- "${cur#*:}" ) )
     else
         len=${#cur}
         idx=0
@@ -143,7 +143,7 @@ _postconf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $( compgen -W '-A -a -b -c -d -e -h -m -l -n -t -v'\
+        COMPREPLY=( $( compgen -W '-A -a -b -c -d -e -h -m -l -n -t -v' \
             -- "$cur" ) )
         return 0
     fi
diff --git a/completions/python b/completions/python
index 9d8fcc9d..4bcaa4c7 100644
--- a/completions/python
+++ b/completions/python
@@ -43,8 +43,6 @@ _python()
             -U -v -V -W -x -c" -- "$cur" ) )
     fi
 
-
-
     return 0
 } &&
 complete -F _python -o filenames python
diff --git a/completions/sbcl b/completions/sbcl
index a43ec1fc..2daf65e3 100644
--- a/completions/sbcl
+++ b/completions/sbcl
@@ -11,11 +11,11 @@ _sbcl()
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $( compgen -W '--core --noinform --help --version \
-        --sysinit --userinit --eval --noprint --disable-debugger \
-        --end-runtime-options --end-toplevel-options ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '--core --noinform --help --version
+            --sysinit --userinit --eval --noprint --disable-debugger
+            --end-runtime-options --end-toplevel-options ' -- "$cur" ) )
     else
-    _filedir
+        _filedir
     fi
 
     return 0
diff --git a/completions/shadow b/completions/shadow
index a3451b7b..ffe66e39 100644
--- a/completions/shadow
+++ b/completions/shadow
@@ -14,7 +14,8 @@ _useradd()
     #       with -u/--uid
 
     case $prev in
-        -c|--comment|-h|--help|-e|--expiredate|-f|--inactive|-k|--key|-p|--password|-u|--uid|-Z|--selinux-user)
+        -c|--comment|-h|--help|-e|--expiredate|-f|--inactive|-k|--key|\
+        -p|--password|-u|--uid|-Z|--selinux-user)
             return 0
             ;;
         -b|--base-dir|-d|--home|-k|--skel)
@@ -64,7 +65,8 @@ _usermod()
     #       with -u/--uid
 
     case $prev in
-        -c|--comment|-d|--home|-e|--expiredate|-f|--inactive|-h|--help|-l|--login|-p|--password|-u|--uid|-Z|--selinux-user)
+        -c|--comment|-d|--home|-e|--expiredate|-f|--inactive|-h|--help|\
+        -l|--login|-p|--password|-u|--uid|-Z|--selinux-user)
             return 0
             ;;
         -g|--gid)
@@ -126,7 +128,8 @@ _chage()
     _split_longopt && split=true
 
     case $prev in
-        -d|--lastday|-E|--expiredate|-h|--help|-I|--inactive|-m|--mindays|-M|--maxdays|-W|--warndays)
+        -d|--lastday|-E|--expiredate|-h|--help|-I|--inactive|-m|--mindays|\
+        -M|--maxdays|-W|--warndays)
             return 0
             ;;
     esac

From e225740294c3e4d53421ab1715e4bb96c21c52c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 12:39:42 +0300
Subject: [PATCH 123/214] Treat all configure --*prefix as dirs.

---
 completions/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/configure b/completions/configure
index d69f85b1..e8a78ffb 100644
--- a/completions/configure
+++ b/completions/configure
@@ -10,7 +10,7 @@ _configure()
     _split_longopt && split=true
 
     case $prev in
-        --prefix|--exec-prefix|--*dir)
+        --*prefix|--*dir)
             _filedir -d
             ;;
     esac

From 4a69a5a53cd68d058b05ce1cd9398eefb00aa5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 12:42:45 +0300
Subject: [PATCH 124/214] Add ext4 features to tune2fs -O completions.

---
 completions/e2fsprogs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/completions/e2fsprogs b/completions/e2fsprogs
index 1a240f1b..15d9175f 100644
--- a/completions/e2fsprogs
+++ b/completions/e2fsprogs
@@ -144,8 +144,9 @@ _tune2fs()
             return 0
             ;;
         -O)
-            local -a opts=(^dir_index ^filetype ^flex_bg ^has_journal
-                ^large_file ^resize_inode ^sparse_super ^uninit_bg)
+            local -a opts=(^dir_index ^dir_nlink ^extent ^extra_isize ^filetype
+                ^flex_bg ^has_journal ^huge_file ^large_file ^resize_inode
+                ^sparse_super ^uninit_bg)
             COMPREPLY=( $( compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur" ) )
             return 0
             ;;

From b9b807e1689ec1498c2da08185753427ea49fc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 21:43:48 +0300
Subject: [PATCH 125/214] Drop simple passwd completion, more thorough one is
 in completions/shadow.

---
 bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index 81ec62a9..a9896ed5 100644
--- a/bash_completion
+++ b/bash_completion
@@ -126,7 +126,7 @@ complete -f -X '!*.lyx' lyx
 # start of section containing compspecs that can be handled within bash
 
 # user commands see only users
-complete -u su passwd write chfn groups slay w sux
+complete -u su write chfn groups slay w sux
 
 # bg completes with stopped jobs
 complete -A stopped -P '"%' -S '"' bg

From 90f3b3dda0e1a3cf1094de94462a0e89c986b9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 21:54:13 +0300
Subject: [PATCH 126/214] Drop simple id completion, more thorough one is in
 completions/coreutils.

---
 bash_completion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index a9896ed5..4e0d3ab7 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1523,7 +1523,7 @@ for i in a2ps autoconf automake bc gprof ld nm objcopy objdump readelf strip \
     touch vdir awk gperf grep grub indent less m4 sed shar date \
     tee who texindex cat csplit cut expand fmt fold head \
     md5sum nl od paste pr ptx sha1sum sort split tac tail tr unexpand \
-    uniq wc ldd bash id irb mkdir rmdir wget curl; do
+    uniq wc ldd bash irb mkdir rmdir wget curl; do
     have $i && complete -F _longopt -o filenames $i
 done
 

From 82c5d5e2ef6e49af41d5422d7006d8fd6bdc9ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 21:58:03 +0300
Subject: [PATCH 127/214] Sort _longopt targets.

---
 bash_completion | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bash_completion b/bash_completion
index 4e0d3ab7..d7d3a764 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1518,12 +1518,12 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-for i in a2ps autoconf automake bc gprof ld nm objcopy objdump readelf strip \
-    bison colordiff diff patch enscript cp df dir du ln ls mkfifo mknod mv rm \
-    touch vdir awk gperf grep grub indent less m4 sed shar date \
-    tee who texindex cat csplit cut expand fmt fold head \
-    md5sum nl od paste pr ptx sha1sum sort split tac tail tr unexpand \
-    uniq wc ldd bash irb mkdir rmdir wget curl; do
+for i in a2ps autoconf automake awk bash bc bison cat colordiff cp csplit \
+    curl cut date df diff dir du enscript expand fmt fold gperf gprof grep \
+    grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod mv nl \
+    nm objcopy objdump od paste patch pr ptx readelf rm rmdir sed sha1sum \
+    shar sort split strip tac tail tee texindex touch tr unexpand uniq vdir \
+    wc wget who; do
     have $i && complete -F _longopt -o filenames $i
 done
 

From edd22493fe35270596cddbfc5158ee879196bc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 22:01:50 +0300
Subject: [PATCH 128/214] Add sha{,224,256,384,512}sum _longopt completions.

---
 CHANGES         | 4 ++--
 bash_completion | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1a28407a..6a855473 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,8 +9,8 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, iftop, lrzip, POSIX sh, sysbench, tune2fs, xmodmap, and xrdb
-    completions.
+    filefrag, iftop, lrzip, POSIX sh, sha{,224,256,384,512}sum, sysbench,
+    tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     and *.awb to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/bash_completion b/bash_completion
index d7d3a764..13f73d56 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1521,9 +1521,9 @@ _longopt()
 for i in a2ps autoconf automake awk bash bc bison cat colordiff cp csplit \
     curl cut date df diff dir du enscript expand fmt fold gperf gprof grep \
     grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod mv nl \
-    nm objcopy objdump od paste patch pr ptx readelf rm rmdir sed sha1sum \
-    shar sort split strip tac tail tee texindex touch tr unexpand uniq vdir \
-    wc wget who; do
+    nm objcopy objdump od paste patch pr ptx readelf rm rmdir sed \
+    sha{,1,224,256,384,512}sum shar sort split strip tac tail tee texindex \
+    touch tr unexpand uniq vdir wc wget who; do
     have $i && complete -F _longopt -o filenames $i
 done
 

From 81b916effc39ff1bf4647dbc6f9dad3d946d0d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 22:04:12 +0300
Subject: [PATCH 129/214] Sort _command and _root_command targets.

---
 bash_completion | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bash_completion b/bash_completion
index 13f73d56..0de5872a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1477,15 +1477,15 @@ _command_offset()
 
     [ ${#COMPREPLY[@]} -eq 0 ] && _filedir
 }
-complete -F _command -o filenames nohup exec nice eval time ltrace then \
-    else do vsound command xargs tsocks aoss padsp
+complete -F _command -o filenames aoss command do else eval exec ltrace nice \
+    nohup padsp then time tsocks vsound xargs
 
 _root_command()
 {
     local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
     _command $1 $2 $3
 }
-complete -F _root_command -o filenames sudo fakeroot really gksudo gksu kdesudo
+complete -F _root_command -o filenames fakeroot gksu gksudo kdesudo really sudo
 
 _longopt()
 {

From 0073c92980dfb81445cc9491be60d1b94933e251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 24 Oct 2010 23:40:55 +0300
Subject: [PATCH 130/214] Add *.gem to tar completions.

---
 CHANGES         |  1 +
 completions/tar | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6a855473..5f34ce42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ bash-completion (2.x)
   * Add *.m2t and *.m2ts to xine-based player filename completions
     (Alioth: #312770).
   * Add /etc/ethers to MAC address completion sources.
+  * Add *.gem to tar completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/tar b/completions/tar
index 81ecbce0..e38bc590 100644
--- a/completions/tar
+++ b/completions/tar
@@ -19,20 +19,20 @@ _tar()
             return 0
             ;;
         +([^IZzJjy])f)
-            ext='t@(ar?(.@(Z|gz|bz?(2)|lz?(ma)|xz))|gz|bz?(2)|lz?(ma)|xz)'
-            regex='t\(ar\(\.\(Z\|gz\|bz2\?\|lzma\|xz\)\)\?\|gz\|bz2\?\|lzma\|xz\)'
+            ext='@(@(tar|gem)?(.@(Z|[gx]z|bz?(2)|lzma))|t@([glx]z|bz?(2)))'
+            regex='\(\(tar\|gem\)\(\.\(Z\|[gx]z\|bz?(2)\|lzma\)\)\?\|t\([glx]z\|bz2\?\)\)'
             ;;
         *[Zz]*f)
-            ext='t?(ar.)@(gz|Z)'
-            regex='t\(ar\.\)\?\(gz\|Z\)'
+            ext='@(t?(ar.)|gem.)@(gz|Z)'
+            regex='\(t\(ar\.\)\?\|gem\.\)\(gz\|Z\)'
             ;;
         *[Ijy]*f)
-            ext='t?(ar.)bz?(2)'
-            regex='t\(ar\.\)\?bz2\?'
+            ext='@(t?(ar.)|gem.)bz?(2)'
+            regex='\(t\(ar\.\)\?\|gem\.\)bz2\?'
             ;;
         *[J]*f)
-            ext='t?(ar.)@(lz?(ma)|xz)'
-            regex='t\(ar\.\)\?\(lzma\|xz\)\?'
+            ext='@(t?(ar.)|gem.)@(lz?(ma)|xz)'
+            regex='\(t\(ar\.\)\?\|gem\.\)\(lzma\|xz\)\?'
             ;;
         *)
             _filedir

From 7d45595493e1f830a3ddbdff845f05ce5a0bc696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 25 Oct 2010 21:39:00 +0300
Subject: [PATCH 131/214] Complete known hosts from avahi-browse only if
 $COMP_KNOWN_HOSTS_WITH_AVAHI is non-empty.

This effectively turns off avahi-browse by default; doing it by
default is not worth it compared to the number of various (mostly
slowness) problems it has caused people, for example Alioth #312691
and RedHat #630326.

Mandriva has applied a similar patch for some time already, although
their environment variable name was different ($COMP_AVAHI_BROWSE).
---
 CHANGES                 |  2 ++
 bash_completion         | 17 ++++++++++-------
 doc/bash_completion.txt |  8 +++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5f34ce42..7815f906 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,8 @@ bash-completion (2.x)
     (Alioth: #312770).
   * Add /etc/ethers to MAC address completion sources.
   * Add *.gem to tar completions.
+  * Complete known hosts from avahi-browse only if $COMP_KNOWN_HOSTS_WITH_AVAHI
+    is non-empty (Alioth: #312691, RedHat: #630326).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 0de5872a..45e76120 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1153,7 +1153,8 @@ _known_hosts()
 
 # Helper function for completing _known_hosts.
 # This function performs host completion based on ssh's config and known_hosts
-# files, as well as hostnames reported by avahi-browse.  Also hosts from
+# files, as well as hostnames reported by avahi-browse if
+# COMP_KNOWN_HOSTS_WITH_AVAHI is set to a non-empty value.  Also hosts from
 # HOSTFILE (compgen -A hostname) are added, unless
 # COMP_KNOWN_HOSTS_WITH_HOSTFILE is set to an empty value.
 # Usage: _known_hosts_real [OPTIONS] CWORD
@@ -1298,12 +1299,14 @@ _known_hosts_real()
             -S "$suffix" -W "$hosts" -- "$cur" ) )
     fi
 
-    # Add hosts reported by avahi-browse, if it's available.
-    # The original call to avahi-browse also had "-k", to avoid lookups into
-    # avahi's services DB. We don't need the name of the service, and if it
-    # contains ";", it may mistify the result. But on Gentoo (at least),
-    # -k isn't available (even if mentioned in the manpage), so...
-    if type avahi-browse >&/dev/null; then
+    # Add hosts reported by avahi-browse, if desired and it's available.
+    if [[ ${COMP_KNOWN_HOSTS_WITH_AVAHI:-} ]] && \
+        type avahi-browse &>/dev/null; then
+        # The original call to avahi-browse also had "-k", to avoid lookups
+        # into avahi's services DB. We don't need the name of the service, and
+        # if it contains ";", it may mistify the result. But on Gentoo (at
+        # least), -k wasn't available (even if mentioned in the manpage) some
+        # time ago, so...
         COMPREPLY=( "${COMPREPLY[@]}" $( \
             compgen -P "$prefix$user" -S "$suffix" -W \
             "$( avahi-browse -cpr _workstation._tcp 2>/dev/null | \
diff --git a/doc/bash_completion.txt b/doc/bash_completion.txt
index c7e7a2b9..b10d6746 100644
--- a/doc/bash_completion.txt
+++ b/doc/bash_completion.txt
@@ -19,7 +19,7 @@ Environment variables
 
 
 *COMP_KNOWN_HOSTS_WITH_HOSTFILE*::
-    If set and not null (default), known_hosts completion will complement
+    If set and not null (default), known hosts completion will complement
     hostnames from ssh's known_hosts_files with hostnames taken from the file
     specified by the HOSTFILE shell variable (compgen -A hostname). If null,
     known_hosts completion will omit hostnames from HOSTFILE.  Omitting
@@ -27,6 +27,12 @@ Environment variables
     local web development or ad-blocking.
 
 
+*COMP_KNOWN_HOSTS_WITH_AVAHI*::
+    If set and not null, known hosts completion will try to use `avahi-browse`
+    for additional completions.  This may be a slow operation in some setups.
+    Default is unset.
+
+
 *COMP_TAR_INTERNAL_PATHS*::
     If set and not null *before* sourcing bash_completion, `tar` completion
     will do correct path completion for tar file contents.  If unset or null,

From 20f7d5c1d20bd723ebe30405d1e6d7c8d65b466c Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Tue, 26 Oct 2010 22:41:01 +0200
Subject: [PATCH 132/214] (testsuite) Improve _filedir unicode test (Alioth
 #312477)

---
 test/unit/_filedir.exp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index a7202b27..a1757a84 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -248,10 +248,17 @@ assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "fixtures/_filedir/ext" $test
 sync_after_int
 
 
-# Execute this test only when LC_CTYPE matches *UTF-8*
-if {[string first "UTF-8" $::LC_CTYPE] != -1} {
-    set test "completing f aé should return g"
+set test "completing f aé should return g when LC_CTYPE=C"
+# Execute this test only on bash >= 4 with LC_CTYPE matching *UTF-8*
+# See also: http://www.mail-archive.com/bash-completion-devel\
+#           @lists.alioth.debian.org/msg02265.html
+if {
+    [lindex $::BASH_VERSINFO 0] >= 4 && 
+    [string first "UTF-8" $::LC_CTYPE] != -1
+} {
     assert_complete_dir g "f aé/" "fixtures/_filedir"
+} else {
+    unsupported "$test"
 }
 
 

From 50dd6c7ac6b07736b37cac60f9a28091ba1416c0 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sun, 31 Oct 2010 07:53:15 +0100
Subject: [PATCH 133/214] (testsuite) Test for expect-5.44 to prevent segfault
 Modified test title

---
 test/unit/_filedir.exp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index a1757a84..59b536e6 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -248,13 +248,16 @@ assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "fixtures/_filedir/ext" $test
 sync_after_int
 
 
-set test "completing f aé should return g when LC_CTYPE=C"
+set test "completing f aé should return g"
 # Execute this test only on bash >= 4 with LC_CTYPE matching *UTF-8*
 # See also: http://www.mail-archive.com/bash-completion-devel\
 #           @lists.alioth.debian.org/msg02265.html
+# Don't execute this test on expect-5.44 cause it will segfault
+# See also: Alioth #312792
 if {
-    [lindex $::BASH_VERSINFO 0] >= 4 && 
-    [string first "UTF-8" $::LC_CTYPE] != -1
+    [lindex $::BASH_VERSINFO 0] >= 4 &&
+    [string first "UTF-8" $::LC_CTYPE] != -1 &&
+    [string first 5.44 [exp_version]] != 0
 } {
     assert_complete_dir g "f aé/" "fixtures/_filedir"
 } else {

From 83bcd69557bcdecb6a6e2b42d5482dfb9e0d65b7 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sun, 31 Oct 2010 17:51:14 +0100
Subject: [PATCH 134/214] (testsuite) Fix _parse_help for LANG=POSIX Steps to
 reproduce the problem:

    $ LANG=POSIX ./run unit/_parse_help.exp
    ...
    Running ./unit/_parse_help.exp ...
    FAIL: short + long
    FAIL: short + long, slash separated

Cause:
When comparing list items, `assert_bash_list()' expects the real list to be
sorted, whereas the output of `_parse_help' is unsorted.
These particular two tests were failing because they suffered the
following LANG-dependant sort-difference:

    $ cat t.txt
    -m
    --n
    $ LANG=en_US.UTF-8 sort t.txt
    -m
    --n
    $ LANG=POSIX sort t.txt
    --n
    -m

Solution:
Made to default for `assert_bash_list' more-intuitive: unsorted, and added an
option `-sort' to explicitly enable sorting.

I felt uncomfortable adding yet another optional argument, so I seized this
opportunity to move subsequent optional arguments to single optional arguments.
E.g.:

    assert_bash_list {expected cmd {test ""} {prompt /@} {size 20}} {

has now become:

    # ...
    # @param list $args  Options:
    #     -nosort         Compare list unsorted.  Default is sorted
    #     -prompt         Bash prompt.  Default is `/@'
    #     -chunk-size N   Compare list N items at a time.  Default
    #                     is 20.
    assert_bash_list {expected cmd test {args {}}

(and the `test' argument has become mandatory).
---
 test/lib/completions/scp.exp    |  2 +-
 test/lib/library.exp            | 85 +++++++++++++++++++++++++--------
 test/unit/_known_hosts_real.exp |  6 +--
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index 4ab514d9..57c41b80 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -101,7 +101,7 @@ assert_bash_exec "cd $dir" "" $prompt
 set cmd "scp -F 'spaced  conf' "
 send "$cmd\t"
 expect -ex "$cmd\r\n"
-if {[match_items [lsort -unique $expected] $test]} {
+if {[match_items [lsort -unique $expected] -bash-sort]} {
     expect {
         -re $prompt { pass "$test" }
         -re eof { unresolved "eof" }
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c5265cc0..b68f4132 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -2,6 +2,7 @@
     # NOTE: DejaGnu has an old `unknown' procedure which unfortunately disables
     #       tcl auto-loading.
 source [file join [info library] init.tcl]
+package require cmdline
 package require textutil::string
 
 
@@ -72,22 +73,37 @@ proc assert_bash_type {command} {
 }
 
 
-# Make sure the expected list is returned by executing the specified command.
-# @param list $expected
-# @param string $cmd  Command given to generate items
-# @param string $test  (optional) Test title.  Default is "$cmd<TAB> should show completions"
-# @param string $prompt  (optional) Bash prompt.  Default is "/@"
-# @param integer $size  (optional) Chunk size.  Default is 20.
-# @result boolean  True if successful, False if not
-proc assert_bash_list {expected cmd {test ""} {prompt /@} {size 20}} {
+# Make sure the expected list matches the real list, as returned by executing
+# the specified bash command.
+# Specify `-sort' if the real list is sorted.
+# @param list $expected  Expected list items
+# @param string $cmd  Bash command to execute in order to generate real list
+#                     items
+# @param string $test  Test title.  Becomes "$cmd should show expected output"
+#                      if empty string.
+# @param list $args  Options:
+#                    -sort           Compare list sorted.  Default is unsorted
+#                    -prompt         Bash prompt.  Default is `/@'
+#                    -chunk-size N   Compare list N items at a time.  Default 
+#                                    is 20.
+proc assert_bash_list {expected cmd test {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {sort                "compare list sorted"}
+        {prompt.arg     /@   "bash prompt"}
+        {chunk-size.arg 20   "compare N list items at a time"}
+    }]
+    set prompt $arg(prompt)
     if {$test == ""} {set test "$cmd should show expected output"}
     if {[llength $expected] == 0} {
         assert_no_output $cmd $test $prompt
     } else {
         send "$cmd\r"
         expect -ex "$cmd\r\n"
-
-        if {[match_items $expected $test $prompt $size]} {
+        if {$arg(sort)} {set bash_sort "-bash-sort"} else {set bash_sort ""}
+        if {[
+            match_items $expected $bash_sort -chunk-size $arg(chunk-size) \
+                -prompt $prompt
+        ]} {
             expect {
                 -re $prompt { pass "$test" }
                 -re eof { unresolved "eof" }
@@ -99,10 +115,29 @@ proc assert_bash_list {expected cmd {test ""} {prompt /@} {size 20}} {
 }
 
 
-proc assert_bash_list_dir {expected cmd dir {test ""} {prompt /@} {size 20}} {
-    set prompt "/$dir/@"
+# Make sure the expected list matches the real list, as returned by executing
+# the specified bash command within the specified directory.
+# Specify `-sort' if the real list is sorted.
+# @param list $expected  Expected list items
+# @param string $cmd  Bash command to generate real list items
+# @param string $dir  Directory to execute $cmd within
+# @param string $test  Test title.  Becomes "$cmd should show expected output"
+#                      if empty string.
+# @param list $args  Options:
+#                    -sort           Compare list sorted.  Default is unsorted
+#                    -prompt         Bash prompt.  Default is `/$dir/@'
+#                    -chunk-size N   Compare list N items at a time.  Default 
+#                                    is 20.
+proc assert_bash_list_dir {expected cmd dir test {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {sort                      "compare list sorted"}
+        {prompt.arg     "/$dir/@"  "bash prompt"}
+        {chunk-size.arg 20         "compare N list items at a time"}
+    }]
+    if {$arg(sort)} {set arg_sort "-sort"} else {set arg_sort ""}
     assert_bash_exec "cd $dir" "" $prompt
-    assert_bash_list $expected $cmd $test $prompt $size
+    assert_bash_list $expected $cmd $test $arg_sort \
+        -chunk-size $arg(chunk-size) -prompt $prompt 
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
 }
@@ -160,7 +195,7 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
             _ltrim_colon_completions cword expected
         }
 
-        if {[match_items $expected $test $prompt $size]} {
+        if {[match_items $expected -bash-sort -chunk-size $size -prompt $prompt]} {
             if {[llength $expected] == 1} {
                 pass "$test"
             } else {
@@ -602,13 +637,25 @@ proc is_cygwin {} {
 }
 
 
-# Expect items.
+# Expect items, a limited number (20) at a time.
 # Break items into chunks because `expect' seems to have a limited buffer size
-# @param list $items
-# @param integer $size  Chunk size
+# @param list $items  Expected list items 
+# @param list $args  Options:
+#                    -bash-sort      Compare list bash-sorted.  Default is
+#                                    unsorted
+#                    -prompt PROMPT  Bash prompt.  Default is `/@'
+#                    -chunk-size CHUNK-SIZE   Compare list CHUNK-SIZE items at
+#                                             a time.  Default is 20.
 # @result boolean  True if successful, False if not
-proc match_items {items test {prompt /@} {size 20}} {
-    set items [bash_sort $items]
+proc match_items {items {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {bash-sort      "compare list sorted"}
+        {prompt.arg     "/@" "bash prompt"}
+        {chunk-size.arg 20   "compare N list items at a time"}
+    }]
+    set prompt $arg(prompt)
+    set size $arg(chunk-size)
+    if {$arg(bash-sort)} {set items [bash_sort $items]}
     set result false
     for {set i 0} {$i < [llength $items]} {set i [expr {$i + $size}]} {
             # For chunks > 1, allow leading whitespace
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index c23a9cef..3276edb4 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -20,7 +20,7 @@ set hosts [get_hosts]
     # doo, ike, jub, 10.0.0.1, kyl, 100.0.0.2, 10.10.0.3, blah, and bunch of IPv6 test cases in ./fixtures/_known_hosts_real/known_hosts
 lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0 1111:2222:3333:4444:5555:6666:xxxx:abab 11xx:2222:3333:4444:5555:6666:xxxx:abab ::42
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
-assert_bash_list $hosts $cmd $test
+assert_bash_list $hosts $cmd $test -sort
 
 
 sync_after_int
@@ -38,7 +38,7 @@ foreach host $hosts {
 }
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY}
-assert_bash_list $expected $cmd $test
+assert_bash_list $expected $cmd $test -sort
 
 
 sync_after_int
@@ -107,7 +107,7 @@ set hosts [get_hosts_avahi]
 lappend hosts blah doo gee hus ike jar jub kyl 10.0.0.1 100.0.0.2 10.10.0.3 fd00:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:5555 fe80::123:0xff:dead:beef%eth0 1111:2222:3333:4444:5555:6666:xxxx:abab 11xx:2222:3333:4444:5555:6666:xxxx:abab ::42
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -aF fixtures/_known_hosts_real/config ''; echo_array COMPREPLY}
-assert_bash_list $hosts $cmd $test
+assert_bash_list $hosts $cmd $test -sort
 sync_after_int
 assert_bash_exec "unset -v COMP_KNOWN_HOSTS_WITH_HOSTFILE"
 

From f4c5d0c5963baeedc1ef321814bd08f5d9b7e098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 19:29:52 +0200
Subject: [PATCH 135/214] Add *.iso to mplayer, kaffeine, and dragon filename
 completions (Alioth: #311420).

xine-ui doesn't seem to support direct opening of *.iso files, so
split it and fbxine and aaxine from kaffeine and dragon completions.
---
 CHANGES             | 6 +++---
 bash_completion     | 3 ++-
 completions/mplayer | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7815f906..ed4f8544 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,7 @@ bash-completion (2.x)
     filefrag, iftop, lrzip, POSIX sh, sha{,224,256,384,512}sum, sysbench,
     tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
-    and *.awb to mplayer filename completions.
+    *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, man, mencoder, mkdir, mplayer,
     povray, rpmbuild, sqlite3, wodim, and general help parsing completions.
@@ -26,8 +26,8 @@ bash-completion (2.x)
     filename extension arguments in addition to exact case matches.
   * IPv6 known hosts completion fixes (Alioth: #312695, RedHat: #630658).
   * Fixes to completions for filenames containing tabs (RedHat: #629518).
-  * Add *.m2t and *.m2ts to xine-based player filename completions
-    (Alioth: #312770).
+  * Add *.iso (Alioth: #311420), *.m2t and *.m2ts (Alioth: #312770) to
+    xine-based player filename completions.
   * Add /etc/ethers to MAC address completion sources.
   * Add *.gem to tar completions.
   * Complete known hosts from avahi-browse only if $COMP_KNOWN_HOSTS_WITH_AVAHI
diff --git a/bash_completion b/bash_completion
index 45e76120..a3ef44a1 100644
--- a/bash_completion
+++ b/bash_completion
@@ -92,7 +92,8 @@ complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
 complete -f -X '!*.texi*' makeinfo texi2html
 complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
 complete -f -X '!*.mp3' mpg123 mpg321 madplay
-complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine kaffeine dragon
+complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine
+complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.part)' kaffeine dragon
 complete -f -X '!*.@(avi|asf|wmv)' aviplay
 complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
diff --git a/completions/mplayer b/completions/mplayer
index cd99a76d..10094869 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -247,7 +247,7 @@ _mplayer()
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB)?(.part)'
+            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB|iso|ISO)?(.part)'
             ;;
     esac
 

From 48438b2061bc42e741e31a646761c7ed6c629444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 20:14:56 +0200
Subject: [PATCH 136/214] Move "compopt -o filenames" kludge to
 _compopt_o_filenames for easier reuse.

---
 bash_completion | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/bash_completion b/bash_completion
index a3ef44a1..3b477cdc 100644
--- a/bash_completion
+++ b/bash_completion
@@ -608,6 +608,16 @@ _quote_readline_by_ref()
 } # _quote_readline_by_ref()
 
 
+# This function turns on "-o filenames" behavior dynamically. It is present
+# for bash < 4 reasons. See http://bugs.debian.org/272660#64 for info about
+# the bash < 4 compgen hack.
+_compopt_o_filenames()
+{
+    compopt -o filenames 2>/dev/null || \
+        compgen -f /non-existing-dir/ >/dev/null
+}
+
+
 # This function performs file and directory completion. It's better than
 # simply using 'compgen -f', because it honours spaces in filenames.
 # @param $1  If `-d', complete only on directories.  Otherwise filter/pick only
@@ -644,12 +654,7 @@ _filedir()
             xspec=${1:+"!*.@($1|$(printf %s $1 | tr '[:lower:]' '[:upper:]'))"}
         toks=( ${toks[@]-} $( compgen -f -X "$xspec" -- $quoted) )
     fi
-    if [ ${#toks[@]} -ne 0 ]; then
-        # Turn on -o filenames; see http://bugs.debian.org/272660#64 for info
-        # about the compgen hack (bash < 4)
-        compopt -o filenames 2>/dev/null || \
-            compgen -f /non-existing-dir/ >/dev/null
-    fi
+    [ ${#toks[@]} -ne 0 ] && _compopt_o_filenames
 
     COMPREPLY=( "${COMPREPLY[@]}" "${toks[@]}" )
 } # _filedir()
@@ -1343,10 +1348,7 @@ _cd()
         return 0
     fi
 
-    # Turn on -o filenames; see http://bugs.debian.org/272660#64 for
-    # info about the compgen hack (bash < 4)
-    compopt -o filenames 2>/dev/null || \
-        compgen -f /non-existing-dir/ >/dev/null
+    _compopt_o_filenames
 
     # Use standard dir completion if no CDPATH or parameter starts with /,
     # ./ or ../

From 9093ae293b006614ac6eb7bb32d60c5df74543d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 20:26:32 +0200
Subject: [PATCH 137/214] Expose root command name from _root_command, add
 _complete_as_root helper.

---
 bash_completion | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bash_completion b/bash_completion
index 3b477cdc..de37fc90 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1489,10 +1489,17 @@ complete -F _command -o filenames aoss command do else eval exec ltrace nice \
 _root_command()
 {
     local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+    local root_command=$1
     _command $1 $2 $3
 }
 complete -F _root_command -o filenames fakeroot gksu gksudo kdesudo really sudo
 
+# Return true if the completion should be treated as running as root
+_complete_as_root()
+{
+    [[ $EUID -eq 0 || ${root_command:-} ]]
+}
+
 _longopt()
 {
     local cur prev split=false

From ff1a0565bcb0cf70c9ab8917e9e7127e128499b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 20:59:53 +0200
Subject: [PATCH 138/214] Fix indentation.

---
 completions/strace | 95 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/completions/strace b/completions/strace
index 9b3e2676..d27c0144 100644
--- a/completions/strace
+++ b/completions/strace
@@ -30,56 +30,57 @@ _strace()
         _get_comp_words_by_ref cur prev
 
         case $prev in
-        -e)
-            if [[ "$cur" == *=* ]]; then
-                prev=${cur/=*/}
-                cur=${cur/*=/}
+            -e)
+                if [[ "$cur" == *=* ]]; then
+                    prev=${cur/=*/}
+                    cur=${cur/*=/}
 
-                # Import arch-specific syscalls -- not foolproof IMHO
-                #+                                     --David Paleino
-                arch=$(command uname -m)
-                syscalls=$(awk '/^#define __NR/ {print $2}' \
-                    /usr/include/asm/unistd.h | sed -e \
-                    's/__NR_//')
-                if [ -z "$syscalls" ]; then
-                    if [[ "$arch" == *86 ]]; then
-                        unistd=/usr/include/asm/unistd_32.h
-                    else
-                        unistd=/usr/include/asm/unistd_64.h
-                    fi
+                    # Import arch-specific syscalls -- not foolproof IMHO
+                    #+                                     --David Paleino
+                    arch=$(command uname -m)
                     syscalls=$(awk '/^#define __NR/ {print $2}' \
-                        $unistd | sed -e 's/__NR_//')
-                fi
+                        /usr/include/asm/unistd.h | sed -e \
+                        's/__NR_//')
+                    if [ -z "$syscalls" ]; then
+                        if [[ "$arch" == *86 ]]; then
+                            unistd=/usr/include/asm/unistd_32.h
+                        else
+                            unistd=/usr/include/asm/unistd_64.h
+                        fi
+                        syscalls=$(awk '/^#define __NR/ {print $2}' \
+                            $unistd | sed -e 's/__NR_//')
+                    fi
 
-                case $prev in
-                    trace)
-                        COMPREPLY=( $( compgen -W "$syscalls file process \
-                            network signal ipc desc all none" -- "$cur") )
-                        return 0
-                        ;;
-                esac
-            else
-                COMPREPLY=( $( compgen -S"=" -W 'trace abbrev \
-                    verbose raw signal read write' -- "$cur" ) )
-            fi
-            return 0
-            ;;
-        -o)
-            _filedir
-            return 0
-            ;;
-        -p)
-            _pids
-            return 0
-            ;;
-        -S)
-            COMPREPLY=( $( compgen -W 'time calls name nothing' -- "$cur" ) )
-            return 0
-            ;;
-        -u)
-            COMPREPLY=( $( compgen -u -- "$cur" ) )
-            return 0
-            ;;
+                    case $prev in
+                        trace)
+                            COMPREPLY=( $( compgen -W "$syscalls file process
+                                network signal ipc desc all none" -- "$cur") )
+                            return 0
+                            ;;
+                    esac
+                else
+                    COMPREPLY=( $( compgen -S"=" -W 'trace abbrev verbose raw
+                        signal read write' -- "$cur" ) )
+                fi
+                return 0
+                ;;
+            -o)
+                _filedir
+                return 0
+                ;;
+            -p)
+                _pids
+                return 0
+                ;;
+            -S)
+                COMPREPLY=( $( compgen -W 'time calls name nothing' \
+                    -- "$cur" ) )
+                return 0
+                ;;
+            -u)
+                COMPREPLY=( $( compgen -u -- "$cur" ) )
+                return 0
+                ;;
         esac
 
         if [[ "$cur" == -* ]]; then

From a877567477da58e6c457a3a1d8d223656e3ed249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 21:23:26 +0200
Subject: [PATCH 139/214] Improve relevance of many user/group completions,
 depending on context.

_usergroup now has a -u option, and there are new _allowed_users and
_allowed_groups helpers.  These can be used to limit returned users
and/or groups to ones that the user has access to (or should be
assumed to have access to if running a "root command").

I had to remove a couple of "funky user" chown test cases because for
some reason they were broken by this change, I didn't immediately find
out why, and I couldn't come up with a valid use case that should be
supported for them that would be more beneficial than the relevance
improvements in this patch.
---
 CHANGES                        |  1 +
 bash_completion                | 52 ++++++++++++++++++++++++++++++----
 completions/coreutils          |  5 ++--
 completions/crontab            |  2 +-
 completions/qemu               |  2 +-
 completions/shadow             |  6 ++--
 completions/strace             |  2 +-
 completions/util-linux         |  2 +-
 test/lib/completions/chown.exp |  4 ++-
 9 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index ed4f8544..646bfda5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -32,6 +32,7 @@ bash-completion (2.x)
   * Add *.gem to tar completions.
   * Complete known hosts from avahi-browse only if $COMP_KNOWN_HOSTS_WITH_AVAHI
     is non-empty (Alioth: #312691, RedHat: #630326).
+  * Improve relevance of many user/group completions, depending on context.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index de37fc90..4f853bea 100644
--- a/bash_completion
+++ b/bash_completion
@@ -977,10 +977,10 @@ _installed_modules()
 # The : must be added manually; it will only complete usernames initially.
 # The legacy user.group format is not supported.
 #
-# It assumes compopt -o filenames; but doesn't touch it.
+# @param $1  If -u, only return users/groups the user has access to in
+#            context of current completion.
 _usergroup()
 {
-    local IFS=$'\n'
     if [[ $cur = *\\\\* || $cur = *:*:* ]]; then
         # Give up early on if something seems horribly wrong.
         return
@@ -991,19 +991,61 @@ _usergroup()
         local prefix
         prefix=${cur%%*([^:])}
         prefix=${prefix//\\}
-        COMPREPLY=( $( compgen -P "$prefix" -g -- "${cur#*[:]}" ) )
+        local mycur="${cur#*[:]}"
+        if [[ $1 == -u ]]; then
+            _allowed_groups "$mycur"
+        else
+            local IFS=$'\n'
+            COMPREPLY=( $( compgen -g -- "$mycur" ) )
+        fi
+        COMPREPLY=( $( compgen -P "$prefix" -W "${COMPREPLY[@]}" ) )
     elif [[ $cur = *:* ]]; then
         # Completing group after 'user:gr<TAB>'.
         # Reply with a list of unprefixed groups since readline with split on :
         # and only replace the 'gr' part
-        COMPREPLY=( $( compgen -g -- "${cur#*:}" ) )
+        local mycur="${cur#*:}"
+        if [[ $1 == -u ]]; then
+            _allowed_groups "$mycur"
+        else
+            local IFS=$'\n'
+            COMPREPLY=( $( compgen -g -- "$mycur" ) )
+        fi
     else
         # Completing a partial 'usernam<TAB>'.
         #
         # Don't suffix with a : because readline will escape it and add a
         # slash. It's better to complete into 'chown username ' than 'chown
         # username\:'.
-        COMPREPLY=( $( compgen -u -- "$cur" ) )
+        if [[ $1 == -u ]]; then
+            _allowed_users "$cur"
+        else
+            local IFS=$'\n'
+            COMPREPLY=( $( compgen -u -- "$cur" ) )
+        fi
+    fi
+}
+
+_allowed_users()
+{
+    if _complete_as_root; then
+        local IFS=$'\n'
+        COMPREPLY=( $( compgen -u -- "${1:-$cur}" ) )
+    else
+        local IFS=$'\n '
+        COMPREPLY=( $( compgen -W \
+            "$( id -un 2>/dev/null || whoami 2>/dev/null )" -- "${1:-$cur}" ) )
+    fi
+}
+
+_allowed_groups()
+{
+    if _complete_as_root; then
+        local IFS=$'\n'
+        COMPREPLY=( $( compgen -g -- "$1" ) )
+    else
+        local IFS=$'\n '
+        COMPREPLY=( $( compgen -W \
+            "$( id -Gn 2>/dev/null || groups 2>/dev/null )" -- "$1" ) )
     fi
 }
 
diff --git a/completions/coreutils b/completions/coreutils
index 65809fbb..75ebaac7 100644
--- a/completions/coreutils
+++ b/completions/coreutils
@@ -41,7 +41,7 @@ _chown()
         _count_args :
 
         if [[ $args == 1 ]]; then
-            _usergroup
+            _usergroup -u
         else
             _filedir
         fi
@@ -84,8 +84,7 @@ _chgrp()
 
     # first parameter on line or first since an option?
     if [[ $COMP_CWORD -eq 1 && "$cur" != -* || "$prev" == -* ]]; then
-        local IFS=$'\n'
-        COMPREPLY=( $( compgen -g "$cur" 2>/dev/null ) )
+        _allowed_groups
     else
         _filedir || return 0
     fi
diff --git a/completions/crontab b/completions/crontab
index cb440a6f..cc279f82 100644
--- a/completions/crontab
+++ b/completions/crontab
@@ -9,7 +9,7 @@ _crontab()
 
     case $prev in
         -u)
-            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            _allowed_users
             return 0
             ;;
     esac
diff --git a/completions/qemu b/completions/qemu
index 1c7a8da0..ca4e318f 100644
--- a/completions/qemu
+++ b/completions/qemu
@@ -96,7 +96,7 @@ _qemu()
             return 0
             ;;
         -runas)
-            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            _allowed_users
             return 0
             ;;
     esac
diff --git a/completions/shadow b/completions/shadow
index ffe66e39..ea265a35 100644
--- a/completions/shadow
+++ b/completions/shadow
@@ -166,7 +166,7 @@ _passwd()
         return 0
     fi
 
-    COMPREPLY=( $( compgen -u -- "$cur" ) )
+    _allowed_users
 } &&
 complete -F _passwd passwd
 
@@ -319,9 +319,11 @@ _newgrp()
     COMPREPLY=()
     if [[ "`_get_cword`" == "-" ]]; then
         COMPREPLY=( - )
+    else
+        _allowed_groups
     fi
 } &&
-complete -g -F _newgrp newgrp
+complete -F _newgrp newgrp
 
 have gpasswd &&
 _gpasswd()
diff --git a/completions/strace b/completions/strace
index d27c0144..0ee27377 100644
--- a/completions/strace
+++ b/completions/strace
@@ -78,7 +78,7 @@ _strace()
                 return 0
                 ;;
             -u)
-                COMPREPLY=( $( compgen -u -- "$cur" ) )
+                _allowed_users
                 return 0
                 ;;
         esac
diff --git a/completions/util-linux b/completions/util-linux
index 8017ebb2..f45ffd56 100644
--- a/completions/util-linux
+++ b/completions/util-linux
@@ -17,7 +17,7 @@ _renice()
         curopt=${COMP_WORDS[COMP_CWORD-$i]}
         case "$curopt" in
             -u)
-                COMPREPLY=( $( compgen -u -- "$cur" ) )
+                _allowed_users
                 ;;
             -g)
                 _pgids
diff --git a/test/lib/completions/chown.exp b/test/lib/completions/chown.exp
index a758cc1d..a34cbe90 100644
--- a/test/lib/completions/chown.exp
+++ b/test/lib/completions/chown.exp
@@ -1,4 +1,6 @@
 proc setup {} {
+    # fake root command to get all users/groups completed at least for now
+    assert_bash_exec {root_command=sudo}
     save_env
 }
 
@@ -43,7 +45,7 @@ if {!$failed_find_unique_completion} {
     sync_after_int
 
     foreach prefix {
-        "funky\\ user:" "funky\\ user\\:" "funky.user:" "funky\\.user:" "fu\\ nky.user\\:"
+        "funky\\ user:" "funky.user:" "funky\\.user:" "fu\\ nky.user:"
         "f\\ o\\ o\\.\\bar:" "foo\\_b\\ a\\.r\\ :"
     } {
         set test "Check preserve special chars in $prefix$partgroup<TAB>"

From ec82c536ed22d5a79eb6d06675fb9f634943fb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 21:40:22 +0200
Subject: [PATCH 140/214] Improve javadoc
 -overview,-helpfile,-stylesheetfile,-link,-linkoffline completions.

---
 CHANGES          |  5 +++--
 completions/java | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 646bfda5..6dd9123e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,8 +14,9 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, man, mencoder, mkdir, mplayer,
-    povray, rpmbuild, sqlite3, wodim, and general help parsing completions.
+  * Improve /etc/init.d/*, ipmitool, jar, javadoc, man, mencoder, mkdir,
+    mplayer, povray, rpmbuild, sqlite3, wodim, and general help parsing
+    completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/java b/completions/java
index 76d2cd4e..5be7ad26 100644
--- a/completions/java
+++ b/completions/java
@@ -176,11 +176,16 @@ _javadoc()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-        -overview|-helpfile|-stylesheetfile)
-            _filedir
+        -overview|-helpfile)
+            _filedir '?(x)htm?(l)'
             return 0
             ;;
-        -d)
+        -stylesheetfile)
+            _filedir css
+            return 0
+            ;;
+        -d|-link|-linkoffline)
+            # TODO: -linkoffline takes two arguments
             _filedir -d
             return 0
             ;;

From ef8b4f27222fb9ade53120cdea5b13927b17a0ca Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sun, 31 Oct 2010 23:20:19 +0100
Subject: [PATCH 141/214] Fix perldoc completions to run without invoking
 autotools Alioth #312729

See also:
http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg02143.html
---
 Makefile.am                                  | 2 +-
 {helpers => completions/helpers}/Makefile.am | 0
 {helpers => completions/helpers}/perldoc     | 0
 completions/perl                             | 2 +-
 configure.ac                                 | 2 +-
 test/lib/completions/perldoc.exp             | 6 ------
 6 files changed, 3 insertions(+), 9 deletions(-)
 rename {helpers => completions/helpers}/Makefile.am (100%)
 rename {helpers => completions/helpers}/perldoc (100%)

diff --git a/Makefile.am b/Makefile.am
index 94016028..dcecc32c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = completions helpers test
+SUBDIRS = completions test
 
 sysconf_DATA = bash_completion
 
diff --git a/helpers/Makefile.am b/completions/helpers/Makefile.am
similarity index 100%
rename from helpers/Makefile.am
rename to completions/helpers/Makefile.am
diff --git a/helpers/perldoc b/completions/helpers/perldoc
similarity index 100%
rename from helpers/perldoc
rename to completions/helpers/perldoc
diff --git a/completions/perl b/completions/perl
index 9a1d84bf..55d07cf8 100644
--- a/completions/perl
+++ b/completions/perl
@@ -49,7 +49,7 @@ _perl()
 }
 complete -F _perl -o nospace -o filenames perl
 
-complete -C $BASH_COMPLETION_DIR/helpers/perldoc -o nospace -o default perldoc
+complete -C ${BASH_SOURCE[0]%/*}/helpers/perldoc -o nospace -o default perldoc
 }
 
 # Local variables:
diff --git a/configure.ac b/configure.ac
index 8cb69952..6f516f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,5 +3,5 @@ AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
-AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index d4461df9..b084dda2 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -11,12 +11,6 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "perldoc -"
-
-
-sync_after_int
-
-
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"

From 1c28fa983dc580184a656c1256b85b36e66db09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Oct 2010 22:39:19 +0200
Subject: [PATCH 142/214] (testsuite) Test sftp -F with sftp instead of ssh.

---
 test/lib/completions/sftp.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 30837ec6..65059721 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -59,7 +59,7 @@ set test "-F should complete filename"
 set dir fixtures/sftp
 set prompt "/$dir/@"
 assert_bash_exec "cd $dir" "" $prompt
-set cmd "ssh -Fsp"
+set cmd "sftp -Fsp"
 send "$cmd\t"
 expect -ex "$cmd"
 expect {

From a58697d15430d28b5cf9e0640ce5d7cc08266106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 1 Nov 2010 19:08:01 +0200
Subject: [PATCH 143/214] Comment update.

---
 completions/xz | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/xz b/completions/xz
index f947b080..d1765fcf 100644
--- a/completions/xz
+++ b/completions/xz
@@ -88,7 +88,7 @@ _xzdec()
 
     $split && return 0
 
-    _filedir xz # no lzma support here as of xz 4.999.8beta
+    _filedir xz # no lzma support here as of xz 4.999.9beta
 } &&
 complete -F _xzdec -o filenames xzdec
 

From 494c44f5a36d29955f46efe2289d0f945a8039c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 1 Nov 2010 19:21:55 +0200
Subject: [PATCH 144/214] Protect filenames with spaces within tar files.

---
 CHANGES         | 2 +-
 completions/tar | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6dd9123e..21d7bf9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@ bash-completion (2.x)
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, javadoc, man, mencoder, mkdir,
-    mplayer, povray, rpmbuild, sqlite3, wodim, and general help parsing
+    mplayer, povray, rpmbuild, sqlite3, tar, wodim, and general help parsing
     completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
diff --git a/completions/tar b/completions/tar
index e38bc590..44c6b45a 100644
--- a/completions/tar
+++ b/completions/tar
@@ -48,7 +48,8 @@ _tar()
         # devise how to untar and list it
         untar=t${COMP_WORDS[1]//[^Izjyf]/}
 
-        COMPREPLY=( $( compgen -W "$( printf '%s ' $( tar $untar $tar \
+        local IFS=$'\n'
+        COMPREPLY=( $( compgen -W "$( printf '%s\n' $( tar $untar $tar \
             2>/dev/null ) )" -- "$cur" ) )
         return 0
     fi

From 0f450219b667ec5f8d951b0c41593c7b983e2ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 1 Nov 2010 19:26:53 +0200
Subject: [PATCH 145/214] Remove most "-o filenames" options to "complete".

Turn it on dynamically when needed instead; see doc/styleguide.txt for
a longer explanation.  This fixes many non-filename completions which
had been previously more or less broken due to unwanted
escape-as-filenames behavior.
---
 CHANGES                         |  2 ++
 bash_completion                 | 25 +++++++++++--------------
 completions/_mock               |  2 +-
 completions/_subversion         |  2 +-
 completions/_yum                |  2 +-
 completions/_yum-utils          |  2 +-
 completions/abook               |  4 +---
 completions/ant                 |  3 +--
 completions/apt                 |  4 ++--
 completions/apt-build           |  2 +-
 completions/aspell              |  2 +-
 completions/bzip2               |  3 ++-
 completions/configure           |  2 +-
 completions/coreutils           |  4 ++--
 completions/cpio                |  3 ++-
 completions/crontab             |  2 +-
 completions/cups                |  2 +-
 completions/dd                  |  2 +-
 completions/dpkg                |  2 +-
 completions/dselect             |  2 +-
 completions/e2fsprogs           | 12 ++++++------
 completions/findutils           |  2 +-
 completions/fuse                |  2 +-
 completions/gcc                 |  4 ++--
 completions/gdb                 |  1 +
 completions/genisoimage         |  2 +-
 completions/gkrellm             |  2 +-
 completions/gnatmake            |  2 +-
 completions/gzip                |  3 ++-
 completions/iconv               |  2 --
 completions/iftop               |  2 +-
 completions/imagemagick         | 22 +++++++++++-----------
 completions/info                |  2 +-
 completions/ipmitool            |  2 +-
 completions/ipv6calc            |  2 +-
 completions/jar                 |  2 +-
 completions/java                |  8 ++++----
 completions/k3b                 |  2 +-
 completions/kldload             |  5 +++--
 completions/lftp                |  3 ++-
 completions/links               |  2 +-
 completions/lintian             |  4 ++--
 completions/lrzip               |  3 ++-
 completions/lzma                |  3 ++-
 completions/lzop                |  3 ++-
 completions/mailman             |  8 ++++----
 completions/make                |  2 +-
 completions/man                 |  2 +-
 completions/mc                  |  2 +-
 completions/mcrypt              |  2 +-
 completions/module-init-tools   |  2 +-
 completions/monodevelop         |  3 ++-
 completions/mplayer             |  2 +-
 completions/mutt                |  3 ++-
 completions/mysqladmin          |  2 +-
 completions/perl                |  3 ++-
 completions/postfix             | 12 +++++++-----
 completions/postgresql          |  2 +-
 completions/povray              |  2 +-
 completions/python              |  2 +-
 completions/qemu                |  2 +-
 completions/rcs                 |  2 +-
 completions/reportbug           |  4 ++--
 completions/rpm                 |  5 ++---
 completions/sbcl                |  2 +-
 completions/sh                  |  2 +-
 completions/shadow              |  6 +++---
 completions/sqlite3             |  2 +-
 completions/ssh                 |  3 ++-
 completions/svk                 |  2 +-
 completions/tar                 |  2 +-
 completions/unace               |  2 +-
 completions/unrar               |  2 +-
 completions/wtf                 |  2 +-
 completions/xmllint             |  2 +-
 completions/xmlwf               |  2 +-
 completions/xmms                |  2 +-
 completions/xmodmap             |  2 +-
 completions/xrdb                |  2 +-
 completions/xsltproc            |  2 +-
 completions/xz                  |  5 +++--
 completions/yum-arch            |  2 +-
 doc/styleguide.txt              | 12 ++++++++++++
 test/completion/acroread.exp    |  2 +-
 test/lib/completions/chown.exp  |  3 +--
 test/lib/completions/screen.exp | 29 ++---------------------------
 test/lib/completions/sftp.exp   | 13 +------------
 test/lib/completions/ssh.exp    | 15 +--------------
 88 files changed, 160 insertions(+), 189 deletions(-)

diff --git a/CHANGES b/CHANGES
index 21d7bf9e..cee60a94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,8 @@ bash-completion (2.x)
   * Complete known hosts from avahi-browse only if $COMP_KNOWN_HOSTS_WITH_AVAHI
     is non-empty (Alioth: #312691, RedHat: #630326).
   * Improve relevance of many user/group completions, depending on context.
+  * Remove most "-o filenames" options to "complete", turn "-o filenames" on
+    dynamically when needed instead.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 4f853bea..de9daefa 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1487,6 +1487,7 @@ _command_offset()
     _get_comp_words_by_ref cur
 
     if [[ $COMP_CWORD -eq 0 ]]; then
+        _compopt_o_filenames
         COMPREPLY=( $( compgen -c -- "$cur" ) )
     else
         cmd=${COMP_WORDS[0]}
@@ -1525,8 +1526,8 @@ _command_offset()
 
     [ ${#COMPREPLY[@]} -eq 0 ] && _filedir
 }
-complete -F _command -o filenames aoss command do else eval exec ltrace nice \
-    nohup padsp then time tsocks vsound xargs
+complete -F _command aoss command do else eval exec ltrace nice nohup padsp \
+    then time tsocks vsound xargs
 
 _root_command()
 {
@@ -1534,7 +1535,7 @@ _root_command()
     local root_command=$1
     _command $1 $2 $3
 }
-complete -F _root_command -o filenames fakeroot gksu gksudo kdesudo really sudo
+complete -F _root_command fakeroot gksu gksudo kdesudo really sudo
 
 # Return true if the completion should be treated as running as root
 _complete_as_root()
@@ -1574,16 +1575,11 @@ _longopt()
 }
 # makeinfo and texi2dvi are defined elsewhere.
 for i in a2ps autoconf automake awk bash bc bison cat colordiff cp csplit \
-    curl cut date df diff dir du enscript expand fmt fold gperf gprof grep \
-    grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod mv nl \
-    nm objcopy objdump od paste patch pr ptx readelf rm rmdir sed \
-    sha{,1,224,256,384,512}sum shar sort split strip tac tail tee texindex \
-    touch tr unexpand uniq vdir wc wget who; do
-    have $i && complete -F _longopt -o filenames $i
-done
-
-# These commands do not use filenames, so '-o filenames' is not needed.
-for i in env netstat seq uname units; do
+    curl cut date df diff dir du enscript env expand fmt fold gperf gprof \
+    grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
+    mv netstat nl nm objcopy objdump od paste patch pr ptx readelf rm rmdir \
+    sed seq sha{,1,224,256,384,512}sum shar sort split strip tac tail tee \
+    texindex touch tr uname unexpand uniq units vdir wc wget who; do
     have $i && complete -F _longopt -o default $i
 done
 unset i
@@ -1636,6 +1632,7 @@ _filedir_xspec()
         }
         ))
 
+    [ ${#toks[@]} -ne 0 ] && _compopt_o_filenames
     COMPREPLY=( "${toks[@]}" )
 }
 list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' "$BASH_COMPLETION" | \
@@ -1657,7 +1654,7 @@ list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' "$BASH_COMPLETION" |
 if [ ${#list[@]} -gt 0 ]; then
     eval complete -r ${list[@]}
     # install new compspecs
-    eval complete -F _filedir_xspec -o filenames "${list[@]}"
+    eval complete -F _filedir_xspec "${list[@]}"
 fi
 unset list
 
diff --git a/completions/_mock b/completions/_mock
index c1888ed1..fa312711 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -74,7 +74,7 @@ _mock()
         _filedir '@(?(no)src.r|s)pm'
     fi
 } &&
-complete -F _mock -o filenames mock
+complete -F _mock mock
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/_subversion b/completions/_subversion
index 4ffe1eae..91523d89 100644
--- a/completions/_subversion
+++ b/completions/_subversion
@@ -216,7 +216,7 @@ _svn()
 
     return 0
 }
-complete -F _svn -o filenames svn
+complete -F _svn svn
 
 _svnadmin()
 {
diff --git a/completions/_yum b/completions/_yum
index 19b79cee..9d3cbb68 100644
--- a/completions/_yum
+++ b/completions/_yum
@@ -146,7 +146,7 @@ _yum()
     fi
 }
 } &&
-complete -F _yum -o filenames yum
+complete -F _yum yum
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/_yum-utils b/completions/_yum-utils
index 49a57f76..b7f6d264 100644
--- a/completions/_yum-utils
+++ b/completions/_yum-utils
@@ -20,7 +20,7 @@ _repomanage()
         _filedir -d
     fi
 } &&
-complete -F _repomanage -o filenames repomanage
+complete -F _repomanage repomanage
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/abook b/completions/abook
index 2a3bc4f6..f09c8b50 100644
--- a/completions/abook
+++ b/completions/abook
@@ -26,13 +26,11 @@ _abook()
 
     case $prev in
         --informat)
-            [ ${BASH_VERSINFO[0]} -ge 4 ] && compopt +o filenames
             COMPREPLY=( $( compgen -W "$(abook --formats | \
                 sed -n -e 's/^\t\([a-z]*\).*/\1/p' -e '/^$/q')" -- "$cur" ) )
             return 0
             ;;
         --outformat)
-            [ ${BASH_VERSINFO[0]} -ge 4 ] && compopt +o filenames
             COMPREPLY=( $( compgen -W "$(abook --formats | \
                 sed -n -e '/^$/,$s/^\t\([a-z]*\).*/\1/p')" -- "$cur" ) )
             return 0
@@ -53,7 +51,7 @@ _abook()
             ;;
     esac
 } &&
-complete -F _abook -o filenames abook
+complete -F _abook abook
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/ant b/completions/ant
index e0d835d6..132c4390 100644
--- a/completions/ant
+++ b/completions/ant
@@ -58,8 +58,7 @@ _ant()
         fi
 }
 have complete-ant-cmd.pl && \
-     complete -C complete-ant-cmd.pl -F _ant -o filenames ant || \
-     complete -F _ant -o filenames ant
+     complete -C complete-ant-cmd.pl -F _ant ant || complete -F _ant ant
 }
 
 # Local variables:
diff --git a/completions/apt b/completions/apt
index 4010a0d5..84811ae8 100644
--- a/completions/apt
+++ b/completions/apt
@@ -71,7 +71,7 @@ _apt_get()
 
     return 0
 } &&
-complete -F _apt_get -o filenames apt-get
+complete -F _apt_get apt-get
 
 # Debian apt-cache(8) completion.
 #
@@ -146,7 +146,7 @@ _apt_cache()
 
     return 0
 } &&
-complete -F _apt_cache -o filenames apt-cache
+complete -F _apt_cache apt-cache
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/apt-build b/completions/apt-build
index 9597ae8d..d875a986 100644
--- a/completions/apt-build
+++ b/completions/apt-build
@@ -55,7 +55,7 @@ _apt_build()
 
     return 0
 } &&
-complete -F _apt_build -o filenames apt-build
+complete -F _apt_build apt-build
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/aspell b/completions/aspell
index e063f497..5254eee7 100644
--- a/completions/aspell
+++ b/completions/aspell
@@ -84,7 +84,7 @@ _aspell()
     fi
 
 }
-complete -F _aspell -o filenames aspell
+complete -F _aspell aspell
 }
 
 # Local variables:
diff --git a/completions/bzip2 b/completions/bzip2
index be030274..7e2f9fd0 100644
--- a/completions/bzip2
+++ b/completions/bzip2
@@ -36,10 +36,11 @@ _bzip2()
 
     _expand || return 0
 
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _bzip2 -o filenames bzip2 pbzip2
+complete -F _bzip2 bzip2 pbzip2
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/configure b/completions/configure
index e8a78ffb..1b207692 100644
--- a/completions/configure
+++ b/completions/configure
@@ -33,7 +33,7 @@ _configure()
             -- "$cur" ) )
     fi
 }
-complete -F _configure -o filenames configure
+complete -F _configure configure
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/coreutils b/completions/coreutils
index 75ebaac7..299aabe0 100644
--- a/completions/coreutils
+++ b/completions/coreutils
@@ -47,7 +47,7 @@ _chown()
         fi
     fi
 } &&
-complete -F _chown -o filenames chown
+complete -F _chown chown
 
 
 # chgrp(1) completion
@@ -91,7 +91,7 @@ _chgrp()
 
     return 0
 } &&
-complete -F _chgrp -o filenames chgrp
+complete -F _chgrp chgrp
 
 # id(1) completion
 #
diff --git a/completions/cpio b/completions/cpio
index e77b4153..5ead0184 100644
--- a/completions/cpio
+++ b/completions/cpio
@@ -30,6 +30,7 @@ _cpio()
             return 0
             ;;
         --rsh-command)
+            _compopt_o_filenames
             COMPREPLY=( $( compgen -c -- "$cur" ) )
             return 0
             ;;
@@ -90,7 +91,7 @@ _cpio()
         esac
     fi
 }
-complete -F _cpio -o filenames cpio
+complete -F _cpio cpio
 }
 
 # Local variables:
diff --git a/completions/crontab b/completions/crontab
index cc279f82..d2ee23a0 100644
--- a/completions/crontab
+++ b/completions/crontab
@@ -49,7 +49,7 @@ _crontab()
     # do filenames only if we did not have -l, -r, or -e
     [[ "${COMP_LINE}" == *\ -@(l|r|e)* ]] || _filedir
 } &&
-complete -F _crontab -o filenames crontab
+complete -F _crontab crontab
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/cups b/completions/cups
index 80c9af54..2848c953 100644
--- a/completions/cups
+++ b/completions/cups
@@ -10,7 +10,7 @@ _cancel()
 
     COMPREPLY=( $( compgen -W "$( lpstat | cut -d' ' -f1 )" -- "$cur" ) )
 } &&
-complete -F _cancel -o filenames cancel
+complete -F _cancel cancel
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/dd b/completions/dd
index 5b952b4f..7b9b3ac7 100644
--- a/completions/dd
+++ b/completions/dd
@@ -28,7 +28,7 @@ _dd()
                 $( compgen -W 'bs cbs conv count ibs if obs of seek skip' \
                            -S '=' -- "$cur" ) )
 } &&
-complete -F _dd -o nospace -o filenames dd
+complete -F _dd -o nospace dd
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/dpkg b/completions/dpkg
index a70ccef8..0556f3d1 100644
--- a/completions/dpkg
+++ b/completions/dpkg
@@ -92,7 +92,7 @@ _dpkg()
 
 
 }
-complete -F _dpkg -o filenames dpkg dpkg-deb
+complete -F _dpkg dpkg dpkg-deb
 }
 
 # Debian GNU dpkg-reconfigure(8) completion
diff --git a/completions/dselect b/completions/dselect
index e33e5bd1..3042a8d0 100644
--- a/completions/dselect
+++ b/completions/dselect
@@ -29,7 +29,7 @@ _dselect()
 
     return 0
 } &&
-complete -F _dselect -o filenames dselect
+complete -F _dselect dselect
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/e2fsprogs b/completions/e2fsprogs
index 15d9175f..50ce7885 100644
--- a/completions/e2fsprogs
+++ b/completions/e2fsprogs
@@ -27,7 +27,7 @@ _badblocks()
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _badblocks -o filenames badblocks
+complete -F _badblocks badblocks
 
 
 have dumpe2fs &&
@@ -55,7 +55,7 @@ _dumpe2fs()
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _dumpe2fs -o filenames dumpe2fs
+complete -F _dumpe2fs dumpe2fs
 
 
 have e2freefrag &&
@@ -79,7 +79,7 @@ _e2freefrag()
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _e2freefrag -o filenames e2freefrag
+complete -F _e2freefrag e2freefrag
 
 
 have e2label &&
@@ -94,7 +94,7 @@ _e2label()
         _filedir
     fi
 } &&
-complete -F _e2label -o filenames e2label
+complete -F _e2label e2label
 
 
 have filefrag &&
@@ -111,7 +111,7 @@ _filefrag()
 
     _filedir
 } &&
-complete -F _filefrag -o filenames filefrag
+complete -F _filefrag filefrag
 
 
 have tune2fs &&
@@ -169,7 +169,7 @@ _tune2fs()
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _tune2fs -o filenames tune2fs
+complete -F _tune2fs tune2fs
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/findutils b/completions/findutils
index 6af5d50b..b8aaa57a 100644
--- a/completions/findutils
+++ b/completions/findutils
@@ -117,7 +117,7 @@ _find()
 
     return 0
 } &&
-complete -F _find -o filenames find
+complete -F _find find
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/fuse b/completions/fuse
index b4d80a28..58d0c516 100644
--- a/completions/fuse
+++ b/completions/fuse
@@ -25,7 +25,7 @@ _fusermount()
         _filedir -d
     fi
 } &&
-complete -F _fusermount -o filenames fusermount
+complete -F _fusermount fusermount
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gcc b/completions/gcc
index 3f5a5619..d78e3e24 100644
--- a/completions/gcc
+++ b/completions/gcc
@@ -46,9 +46,9 @@ _gcc()
         _filedir
     fi
 } &&
-complete -o filenames -F _gcc gcc g++ c++ g77 gcj gpc
+complete -F _gcc gcc g++ c++ g77 gcj gpc
 [ $USERLAND = GNU -o $UNAME = Cygwin ] && \
-[ -n "${have:-}" ] && complete -o filenames -F _gcc cc
+[ -n "${have:-}" ] && complete -F _gcc cc
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gdb b/completions/gdb
index dc769613..f0bc42d3 100644
--- a/completions/gdb
+++ b/completions/gdb
@@ -10,6 +10,7 @@ _gdb()
 
     if [ $COMP_CWORD -eq 1 ]; then
         local IFS
+        _compopt_o_filenames
         if [[ "$cur" == */* ]]; then
             # compgen -c works as expected if $cur contains any slashes.
             IFS=$'\n'
diff --git a/completions/genisoimage b/completions/genisoimage
index 7f379041..61b18114 100644
--- a/completions/genisoimage
+++ b/completions/genisoimage
@@ -66,7 +66,7 @@ _mkisofs()
     fi
 
 } &&
-complete -F _mkisofs -o filenames mkisofs genisoimage
+complete -F _mkisofs mkisofs genisoimage
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gkrellm b/completions/gkrellm
index 1e3925f1..13e25ada 100644
--- a/completions/gkrellm
+++ b/completions/gkrellm
@@ -43,7 +43,7 @@ _gkrellm()
     fi
 
 } &&
-complete -F _gkrellm -o filenames gkrellm gkrellm2
+complete -F _gkrellm gkrellm gkrellm2
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gnatmake b/completions/gnatmake
index 11b04908..cdd193c1 100644
--- a/completions/gnatmake
+++ b/completions/gnatmake
@@ -26,7 +26,7 @@ _gnatmake()
         _filedir '@(adb|ads)'
     fi
 } &&
-complete -F _gnatmake -o filenames gnatmake
+complete -F _gnatmake gnatmake
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/gzip b/completions/gzip
index afd647ed..f7aec17e 100644
--- a/completions/gzip
+++ b/completions/gzip
@@ -40,10 +40,11 @@ _gzip()
 
     _expand || return 0
 
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _gzip -o filenames gzip pigz
+complete -F _gzip gzip pigz
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/iconv b/completions/iconv
index 14b618dc..9e332004 100644
--- a/completions/iconv
+++ b/completions/iconv
@@ -36,8 +36,6 @@ _iconv()
     fi
 } &&
 complete -F _iconv -o default iconv
-# Intentionally not -o filenames here, -f/-t completions may contain slashes
-# and -o filenames would break them.
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/iftop b/completions/iftop
index eefcf9c6..9ec2a0d0 100644
--- a/completions/iftop
+++ b/completions/iftop
@@ -24,7 +24,7 @@ _iftop()
     COMPREPLY=( $( compgen -W '-h -n -N -p -P -b -B -i -f -F -c -m' \
         -- "$cur" ) )
 } &&
-complete -F _iftop -o filenames iftop
+complete -F _iftop iftop
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/imagemagick b/completions/imagemagick
index 5366e619..c7ba74c8 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -189,7 +189,7 @@ _convert()
         _filedir
     fi
 }
-complete -F _convert -o filenames convert
+complete -F _convert convert
 
 _mogrify()
 {
@@ -245,7 +245,7 @@ _mogrify()
         _filedir
     fi
 }
-complete -F _mogrify -o filenames mogrify
+complete -F _mogrify mogrify
 
 _display()
 {
@@ -285,7 +285,7 @@ _display()
         _filedir
     fi
 }
-complete -F _display -o filenames display
+complete -F _display display
 
 _animate()
 {
@@ -319,7 +319,7 @@ _animate()
         _filedir
     fi
 }
-complete -F _animate -o filenames animate
+complete -F _animate animate
 
 _identify()
 {
@@ -344,7 +344,7 @@ _identify()
         _filedir
     fi
 }
-complete -F _identify -o filenames identify
+complete -F _identify identify
 
 _montage()
 {
@@ -382,7 +382,7 @@ _montage()
         _filedir
     fi
 }
-complete -F _montage -o filenames montage
+complete -F _montage montage
 
 _composite()
 {
@@ -417,7 +417,7 @@ _composite()
         _filedir
     fi
 }
-complete -F _composite -o filenames composite
+complete -F _composite composite
 
 _compare()
 {
@@ -444,7 +444,7 @@ _compare()
         _filedir
     fi
 }
-complete -F _compare -o filenames compare
+complete -F _compare compare
 
 _conjure()
 {
@@ -464,7 +464,7 @@ _conjure()
         _filedir
     fi
 }
-complete -F _conjure -o filenames conjure
+complete -F _conjure conjure
 
 _import()
 {
@@ -495,7 +495,7 @@ _import()
         _filedir
     fi
 }
-complete -F _import -o filenames import
+complete -F _import import
 
 _stream()
 {
@@ -520,7 +520,7 @@ _stream()
         _filedir
     fi
 }
-complete -F _stream -o filenames stream
+complete -F _stream stream
 }
 
 # Local variables:
diff --git a/completions/info b/completions/info
index 55791d31..367cadef 100644
--- a/completions/info
+++ b/completions/info
@@ -47,7 +47,7 @@ _info()
 
     return 0
 } &&
-complete -F _info -o filenames info
+complete -F _info info
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/ipmitool b/completions/ipmitool
index 7af8da88..3a90eeb4 100644
--- a/completions/ipmitool
+++ b/completions/ipmitool
@@ -203,7 +203,7 @@ _ipmitool()
 }
 
 } &&
-complete -F _ipmitool -o filenames ipmitool
+complete -F _ipmitool ipmitool
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/ipv6calc b/completions/ipv6calc
index 75f55e74..20e810df 100644
--- a/completions/ipv6calc
+++ b/completions/ipv6calc
@@ -46,7 +46,7 @@ _ipv6calc()
 
     return 0
 } &&
-complete -F _ipv6calc -o filenames ipv6calc
+complete -F _ipv6calc ipv6calc
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/jar b/completions/jar
index 6abfff3d..f60eb3ef 100644
--- a/completions/jar
+++ b/completions/jar
@@ -25,7 +25,7 @@ _jar()
             ;;
     esac
 } &&
-complete -F _jar -o filenames jar
+complete -F _jar jar
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/java b/completions/java
index 5be7ad26..fcdc5723 100644
--- a/completions/java
+++ b/completions/java
@@ -164,7 +164,7 @@ _java()
         fi
     fi
 }
-complete -F _java -o filenames java
+complete -F _java java
 }
 
 have javadoc &&
@@ -217,7 +217,7 @@ _javadoc()
         _java_packages
     fi
 } &&
-complete -F _javadoc -o filenames javadoc
+complete -F _javadoc javadoc
 
 have javac &&
 _javac()
@@ -249,7 +249,7 @@ _javac()
         _filedir java
     fi
 } &&
-complete -F _javac -o filenames javac
+complete -F _javac javac
 
 have pack200 &&
 _pack200()
@@ -418,7 +418,7 @@ _jarsigner()
         _filedir jar
     fi
 } &&
-complete -F _jarsigner -o filenames jarsigner
+complete -F _jarsigner jarsigner
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/k3b b/completions/k3b
index a2b0af6b..1965717b 100644
--- a/completions/k3b
+++ b/completions/k3b
@@ -44,7 +44,7 @@ _k3b()
         _filedir
     fi
 } &&
-complete -F _k3b -o filenames k3b
+complete -F _k3b k3b
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/kldload b/completions/kldload
index a230dbb5..e5bce0a3 100644
--- a/completions/kldload
+++ b/completions/kldload
@@ -11,13 +11,14 @@ _kldload()
     [ -d $moddir ] || moddir=/boot/kernel/
     _get_comp_words_by_ref cur
 
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f "$moddir$cur" ) )
     COMPREPLY=( ${COMPREPLY[@]#$moddir} )
     COMPREPLY=( ${COMPREPLY[@]%.ko} )
 
     return 0
 }
-complete -F _kldload -o filenames kldload
+complete -F _kldload kldload
 
 _kldunload()
 {
@@ -26,7 +27,7 @@ _kldunload()
     COMPREPLY=( $( kldstat | \
         sed -ne "s/^.*[ \t]\{1,\}\($cur[a-z_]\{1,\}\).ko$/\1/p" ) )
 }
-complete -F _kldunload -o filenames kldunload
+complete -F _kldunload kldunload
 
 }
 
diff --git a/completions/lftp b/completions/lftp
index 15d0a977..1de87aec 100644
--- a/completions/lftp
+++ b/completions/lftp
@@ -28,7 +28,8 @@ _lftp()
         '$( cut -f 1 -s ~/.lftp/bookmarks 2>/dev/null )' -- "$cur" ) )
     _known_hosts_real "$cur"
 } &&
-complete -F _lftp -o filenames lftp
+complete -F _lftp lftp
+
 have lftpget &&
 _lftpget()
 {
diff --git a/completions/links b/completions/links
index 4b5c683a..9b7b50f0 100644
--- a/completions/links
+++ b/completions/links
@@ -32,7 +32,7 @@ _links()
 
     return 0
 } &&
-complete -F _links -o filenames links
+complete -F _links links
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/lintian b/completions/lintian
index a1f51546..e2237893 100644
--- a/completions/lintian
+++ b/completions/lintian
@@ -181,6 +181,6 @@ _lintian_info() {
     return 0
 }
 
-complete -F _lintian -o filenames lintian
-complete -F _lintian_info -o filenames lintian-info
+complete -F _lintian lintian
+complete -F _lintian_info lintian-info
 }
diff --git a/completions/lrzip b/completions/lrzip
index 445fc3c5..5cde88a8 100644
--- a/completions/lrzip
+++ b/completions/lrzip
@@ -49,10 +49,11 @@ _lrzip()
     _expand || return 0
 
     local IFS=$'\n'
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _lrzip -o filenames lrzip
+complete -F _lrzip lrzip
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/lzma b/completions/lzma
index c2fece97..295ef37b 100644
--- a/completions/lzma
+++ b/completions/lzma
@@ -31,10 +31,11 @@ _lzma()
 
     _expand || return 0
 
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _lzma -o filenames lzma
+complete -F _lzma lzma
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/lzop b/completions/lzop
index 7a34ae3e..6d384128 100644
--- a/completions/lzop
+++ b/completions/lzop
@@ -54,10 +54,11 @@ _lzop()
     _expand || return 0
 
     local IFS=$'\n'
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
             $( compgen -d -- "$cur" ) )
 } &&
-complete -F _lzop -o filenames lzop
+complete -F _lzop lzop
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/mailman b/completions/mailman
index 33227897..b239cbbf 100644
--- a/completions/mailman
+++ b/completions/mailman
@@ -368,7 +368,7 @@ _config_list()
     fi
 
 } &&
-complete -F _config_list -o filenames config_list
+complete -F _config_list config_list
 
 # Try to detect whether this is the mailman "arch" to avoid installing
 # it for the coreutils/util-linux-ng one.
@@ -416,7 +416,7 @@ _arch()
     fi
 
 } &&
-complete -F _arch -o filenames arch
+complete -F _arch arch
 
 have cleanarch &&
 _cleanarch()
@@ -460,7 +460,7 @@ _inject()
     fi
 
 } &&
-complete -F _inject -o filenames inject
+complete -F _inject inject
 
 have dumpdb &&
 _dumpdb()
@@ -478,7 +478,7 @@ _dumpdb()
     fi
 
 } &&
-complete -F _dumpdb -o filenames dumpdb
+complete -F _dumpdb dumpdb
 
 have check_db &&
 _check_db()
diff --git a/completions/make b/completions/make
index e792b348..76e95284 100644
--- a/completions/make
+++ b/completions/make
@@ -67,7 +67,7 @@ _make()
 
     fi
 } &&
-complete -F _make -o filenames make gmake gnumake pmake
+complete -F _make make gmake gnumake pmake
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/man b/completions/man
index 6918fb41..9e5cd3a8 100644
--- a/completions/man
+++ b/completions/man
@@ -69,7 +69,7 @@ _man()
     __ltrim_colon_completions "$cur"
     return 0
 } &&
-complete -F _man -o filenames man apropos whatis
+complete -F _man man apropos whatis
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/mc b/completions/mc
index 910fef13..09e9eabe 100644
--- a/completions/mc
+++ b/completions/mc
@@ -36,7 +36,7 @@ _mc()
         _filedir -d
     fi
 } &&
-complete -F _mc -o filenames mc
+complete -F _mc mc
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/mcrypt b/completions/mcrypt
index 9e746fb1..32c4f89f 100644
--- a/completions/mcrypt
+++ b/completions/mcrypt
@@ -73,7 +73,7 @@ _mcrypt()
         fi
     fi
 } &&
-complete -o filenames -F _mcrypt mcrypt mdecrypt
+complete -F _mcrypt mcrypt mdecrypt
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/module-init-tools b/completions/module-init-tools
index 8c0f13ea..bf2d24d1 100644
--- a/completions/module-init-tools
+++ b/completions/module-init-tools
@@ -50,7 +50,7 @@ _insmod()
 
     return 0
 } &&
-complete -F _insmod -o filenames insmod modprobe modinfo
+complete -F _insmod insmod modprobe modinfo
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/monodevelop b/completions/monodevelop
index 1aa117b0..69b23445 100644
--- a/completions/monodevelop
+++ b/completions/monodevelop
@@ -50,6 +50,7 @@ _mdtool()
                 return 0
                 ;;
             "generate-makefiles")
+                _compopt_o_filenames
                 COMPREPLY=( $( compgen -o filenames -G"*.mds" -- "$cur" ) )
                 if [[ "$prev" == *mds ]]; then
                     COMPREPLY=( $( compgen -W '--simple-makefiles --s --d:' \
@@ -74,7 +75,7 @@ _mdtool()
 
     return 0
 } &&
-complete -F _mdtool -o filenames mdtool
+complete -F _mdtool mdtool
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/mplayer b/completions/mplayer
index 10094869..ed5ab92c 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -253,7 +253,7 @@ _mplayer()
 
     return 0
 }
-complete -o filenames -F _mplayer mplayer mencoder gmplayer kplayer
+complete -F _mplayer mplayer mencoder gmplayer kplayer
 }
 
 # Local variables:
diff --git a/completions/mutt b/completions/mutt
index f86e6759..b8124f28 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -120,6 +120,7 @@ _muttfiledir()
 
         # Match any file in $folder beginning with $cur
         # (minus the leading '=' sign).
+        _compopt_o_filenames
         COMPREPLY=( $( compgen -f -- "$folder/${cur:1}" ) )
         COMPREPLY=( ${COMPREPLY[@]#$folder/} )
         return 0
@@ -170,7 +171,7 @@ _mutt()
         ;;
     esac
 } # _mutt()
-complete -F _mutt -o default -o filenames mutt muttng
+complete -F _mutt -o default mutt muttng
 } # have mutt
 
 # Local variables:
diff --git a/completions/mysqladmin b/completions/mysqladmin
index a7e002d3..c9415696 100644
--- a/completions/mysqladmin
+++ b/completions/mysqladmin
@@ -60,7 +60,7 @@ _mysqladmin()
         kill password old-password ping processlist reload refresh shutdown \
         status start-slave stop-slave variables version' -- "$cur" ) )
 } &&
-complete -F _mysqladmin -o filenames mysqladmin
+complete -F _mysqladmin mysqladmin
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/perl b/completions/perl
index 55d07cf8..dc71742c 100644
--- a/completions/perl
+++ b/completions/perl
@@ -31,6 +31,7 @@ _perl()
     case $prev in
         -I|-x)
             local IFS=$'\n'
+            _compopt_o_filenames
             COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
             return 0
             ;;
@@ -47,7 +48,7 @@ _perl()
         _filedir
     fi
 }
-complete -F _perl -o nospace -o filenames perl
+complete -F _perl -o nospace perl
 
 complete -C ${BASH_SOURCE[0]%/*}/helpers/perldoc -o nospace -o default perldoc
 }
diff --git a/completions/postfix b/completions/postfix
index d9de61dc..1311c987 100644
--- a/completions/postfix
+++ b/completions/postfix
@@ -29,7 +29,7 @@ _postfix()
     COMPREPLY=( $( compgen -W 'check start stop abort flush reload status \
         set-permissions upgrade-configuration' -- "$cur" ) )
 }
-complete -F _postfix -o filenames postfix
+complete -F _postfix postfix
 
 # postalias(1) and postmap(1)
 #
@@ -57,6 +57,7 @@ _postmap()
     fi
 
     if [[ "$cur" == *:* ]]; then
+        _compopt_o_filenames
         COMPREPLY=( $( compgen -f -- "${cur#*:}" ) )
     else
         len=${#cur}
@@ -68,12 +69,13 @@ _postmap()
             fi
         done
         if [[ $idx -eq 0 ]]; then
+            _compopt_o_filenames
             COMPREPLY=( $( compgen -f -- "$cur" ) )
         fi
     fi
     return 0
 }
-complete -F _postmap -o filenames postmap postalias
+complete -F _postmap postmap postalias
 
 # postcat(1)
 #
@@ -116,7 +118,7 @@ _postcat()
         return 0
     fi
 }
-complete -F _postcat -o filenames postcat
+complete -F _postcat postcat
 
 # postconf(1)
 #
@@ -158,7 +160,7 @@ _postconf()
     done
     return 0
 }
-complete -F _postconf -o filenames postconf
+complete -F _postconf postconf
 
 # postsuper(1)
 #
@@ -219,7 +221,7 @@ _postsuper()
 
     COMPREPLY=( $( compgen -W 'hold incoming active deferred' -- "$cur" ) )
 }
-complete -F _postsuper -o filenames postsuper
+complete -F _postsuper postsuper
 }
 
 # Local variables:
diff --git a/completions/postgresql b/completions/postgresql
index 392c9aa6..d42d6e17 100644
--- a/completions/postgresql
+++ b/completions/postgresql
@@ -151,7 +151,7 @@ _psql()
         _pg_databases
     fi
 }
-complete -F _psql -o filenames psql
+complete -F _psql psql
 }
 
 # Local variables:
diff --git a/completions/povray b/completions/povray
index 7abc497a..a843a5cb 100644
--- a/completions/povray
+++ b/completions/povray
@@ -54,7 +54,7 @@ _povray()
             ;;
     esac
 } &&
-complete -F _povray -o filenames povray xpovray spovray
+complete -F _povray povray xpovray spovray
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/python b/completions/python
index 4bcaa4c7..54a99da1 100644
--- a/completions/python
+++ b/completions/python
@@ -45,7 +45,7 @@ _python()
 
     return 0
 } &&
-complete -F _python -o filenames python
+complete -F _python python
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/qemu b/completions/qemu
index ca4e318f..03fa5632 100644
--- a/completions/qemu
+++ b/completions/qemu
@@ -121,7 +121,7 @@ _qemu()
         _filedir
     fi
 } &&
-complete -F _qemu -o filenames qemu
+complete -F _qemu qemu
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/rcs b/completions/rcs
index 42ac8d5a..d859b8a9 100644
--- a/completions/rcs
+++ b/completions/rcs
@@ -32,7 +32,7 @@ _rcs()
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs -o filenames ci co rlog rcs rcsdiff
+complete -F _rcs ci co rlog rcs rcsdiff
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/reportbug b/completions/reportbug
index 51e37fb7..0c44bd68 100644
--- a/completions/reportbug
+++ b/completions/reportbug
@@ -84,7 +84,7 @@ _reportbug()
     _filedir
     return 0
 } &&
-complete -F _reportbug -o filenames reportbug
+complete -F _reportbug reportbug
 
 have querybts &&
 _querybts()
@@ -121,7 +121,7 @@ _querybts()
         www.debian.org' -- "$cur" ) \
         $( apt-cache pkgnames -- "$cur" 2> /dev/null) )
 } &&
-complete -F _querybts -o filenames querybts
+complete -F _querybts querybts
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/rpm b/completions/rpm
index 9bd19f68..f07ba7de 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -24,8 +24,6 @@ _rpm_installed_packages()
 
 _rpm_groups()
 {
-    # TODO: shown completions are wrong but real ones work nevertheless
-    # http://lists.alioth.debian.org/pipermail/bash-completion-devel/2009-May/001486.html
     local IFS=$'\n'
     COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig --queryformat \
         '%{group}\n' )" -- "$cur" ) )
@@ -101,6 +99,7 @@ _rpm()
             return 0
             ;;
         --pipe)
+            _compopt_o_filenames
             COMPREPLY=( $( compgen -c -- "$cur" ) )
             return 0
             ;;
@@ -288,7 +287,7 @@ _rpm()
 
     return 0
 }
-complete -F _rpm -o filenames rpm rpmbuild
+complete -F _rpm rpm rpmbuild
 }
 
 # Local variables:
diff --git a/completions/sbcl b/completions/sbcl
index 2daf65e3..33671a6e 100644
--- a/completions/sbcl
+++ b/completions/sbcl
@@ -20,7 +20,7 @@ _sbcl()
 
     return 0
 } &&
-complete -F _sbcl -o filenames sbcl sbcl-mt
+complete -F _sbcl sbcl sbcl-mt
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/sh b/completions/sh
index f33705de..9c7ca020 100644
--- a/completions/sh
+++ b/completions/sh
@@ -30,7 +30,7 @@ _sh()
 
     _filedir sh
 } &&
-complete -F _sh -o filenames sh
+complete -F _sh sh
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/shadow b/completions/shadow
index ea265a35..6aea045b 100644
--- a/completions/shadow
+++ b/completions/shadow
@@ -232,7 +232,7 @@ _newusers()
 
     _filedir
 } &&
-complete -F _newusers -o filenames newusers
+complete -F _newusers newusers
 
 have pwck &&
 _pwck()
@@ -249,7 +249,7 @@ _pwck()
 
     _filedir
 } &&
-complete -F _pwck -o filenames pwck
+complete -F _pwck pwck
 
 have groupadd &&
 _groupadd()
@@ -390,7 +390,7 @@ _grpck()
 
     _filedir
 } &&
-complete -F _grpck -o filenames grpck
+complete -F _grpck grpck
 
 have vipw || have vigr &&
 _vipw()
diff --git a/completions/sqlite3 b/completions/sqlite3
index f02b2e09..b37c55f7 100644
--- a/completions/sqlite3
+++ b/completions/sqlite3
@@ -28,7 +28,7 @@ _sqlite3()
 
     _filedir $dbexts
 } &&
-complete -F _sqlite3 -o filenames sqlite3
+complete -F _sqlite3 sqlite3
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/ssh b/completions/ssh
index 2c20c2d3..6793ddf0 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -184,6 +184,7 @@ _ssh()
         done
         _known_hosts_real -a -F "$configfile" "$cur"
         if [ $COMP_CWORD -ne 1 ]; then
+            _compopt_o_filenames
             COMPREPLY=( "${COMPREPLY[@]}" $( compgen -c -- "$cur" ) )
         fi
     fi
@@ -415,7 +416,7 @@ _ssh_copy_id()
 
     return 0
 }
-complete -F _ssh_copy_id -o filenames ssh-copy-id
+complete -F _ssh_copy_id ssh-copy-id
 }
 
 # Local variables:
diff --git a/completions/svk b/completions/svk
index c809d2eb..bda5997a 100644
--- a/completions/svk
+++ b/completions/svk
@@ -214,7 +214,7 @@ _svk()
 
     return 0
 } &&
-complete -F _svk -o filenames svk
+complete -F _svk svk
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/tar b/completions/tar
index 44c6b45a..fba25d61 100644
--- a/completions/tar
+++ b/completions/tar
@@ -60,7 +60,7 @@ _tar()
     return 0
 }
 [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ] && complete -F _tar -o dirnames tar ||
-    complete -F _tar -o filenames tar
+    complete -F _tar tar
 }
 
 # Local variables:
diff --git a/completions/unace b/completions/unace
index 73d635d5..9d27ef50 100644
--- a/completions/unace
+++ b/completions/unace
@@ -18,7 +18,7 @@ _unace()
         fi
     fi
 } &&
-complete -F _unace -o filenames unace
+complete -F _unace unace
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/unrar b/completions/unrar
index 0f5f7094..0a4fe27a 100644
--- a/completions/unrar
+++ b/completions/unrar
@@ -21,7 +21,7 @@ _unrar()
     fi
 
 } &&
-complete -F _unrar -o filenames unrar
+complete -F _unrar unrar
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/wtf b/completions/wtf
index 2b6c4d01..a611978d 100644
--- a/completions/wtf
+++ b/completions/wtf
@@ -25,7 +25,7 @@ _wtf()
 
     COMPREPLY=( $( compgen -W "$( cut -f 1 -s $db ) -f" -- "${cur}" ) )
 } &&
-complete -F _wtf -o filenames wtf
+complete -F _wtf wtf
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xmllint b/completions/xmllint
index d8b5051c..27ba61e0 100644
--- a/completions/xmllint
+++ b/completions/xmllint
@@ -44,7 +44,7 @@ _xmllint()
 
     _filedir '@(*ml|htm|svg|xs[dl]|rng|wsdl)'
 } &&
-complete -F _xmllint -o filenames xmllint
+complete -F _xmllint xmllint
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xmlwf b/completions/xmlwf
index 7109bcd3..74cf0812 100644
--- a/completions/xmlwf
+++ b/completions/xmlwf
@@ -28,7 +28,7 @@ _xmlwf()
 
     _filedir '@(*ml|htm|svg)'
 } &&
-complete -F _xmlwf -o filenames xmlwf
+complete -F _xmlwf xmlwf
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xmms b/completions/xmms
index 91b9ff5c..662e2faa 100644
--- a/completions/xmms
+++ b/completions/xmms
@@ -19,7 +19,7 @@ _xmms()
     fi
 
 } &&
-complete -F _xmms -o filenames xmms
+complete -F _xmms xmms
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xmodmap b/completions/xmodmap
index f4f29150..cde9e7e1 100644
--- a/completions/xmodmap
+++ b/completions/xmodmap
@@ -21,7 +21,7 @@ _xmodmap()
 
     _filedir
 } &&
-complete -F _xmodmap -o filenames xmodmap
+complete -F _xmodmap xmodmap
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xrdb b/completions/xrdb
index 423c0927..7307f013 100644
--- a/completions/xrdb
+++ b/completions/xrdb
@@ -26,7 +26,7 @@ _xrdb()
 
     _filedir
 } &&
-complete -F _xrdb -o filenames xrdb
+complete -F _xrdb xrdb
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xsltproc b/completions/xsltproc
index f71d3f11..2782f805 100644
--- a/completions/xsltproc
+++ b/completions/xsltproc
@@ -45,7 +45,7 @@ _xsltproc()
 	_filedir '@(xsl|xslt|xml)'
     fi
 } &&
-complete -F _xsltproc -o filenames xsltproc
+complete -F _xsltproc xsltproc
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/xz b/completions/xz
index d1765fcf..89a8ac98 100644
--- a/completions/xz
+++ b/completions/xz
@@ -53,10 +53,11 @@ _xz()
     _expand || return 0
 
     local IFS=$'\n'
+    _compopt_o_filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _xz -o filenames xz
+complete -F _xz xz
 
 # xzdec(1) completion
 #
@@ -90,7 +91,7 @@ _xzdec()
 
     _filedir xz # no lzma support here as of xz 4.999.9beta
 } &&
-complete -F _xzdec -o filenames xzdec
+complete -F _xzdec xzdec
 
 # Local variables:
 # mode: shell-script
diff --git a/completions/yum-arch b/completions/yum-arch
index 3728335c..bb864af4 100644
--- a/completions/yum-arch
+++ b/completions/yum-arch
@@ -13,7 +13,7 @@ _yum_arch()
         _filedir -d
     fi
 } &&
-complete -F _yum_arch -o filenames yum-arch
+complete -F _yum_arch yum-arch
 
 # Local variables:
 # mode: shell-script
diff --git a/doc/styleguide.txt b/doc/styleguide.txt
index 4dbd5732..24f28636 100644
--- a/doc/styleguide.txt
+++ b/doc/styleguide.txt
@@ -54,6 +54,18 @@ is preferable because anyone, with any keyboard layout, is able to
 type it. Backticks aren't always available, without doing strange
 key combinations.
 
+-o filenames
+------------
+
+As a rule of thumb, do not use "complete -o filenames". Doing it makes
+it take effect for all completions from the affected function, which
+may break things if some completions from the function must not be
+escaped as filenames. Instead, use the _compopt_o_filenames function
+to turn on "-o filenames" behavior dynamically when returning
+completions that need that kind of processing (e.g. file and command
+names). The _filedir and _filedir_xspec helpers do this automatically
+whenever they return some completions.
+
 /////////////////////////////////////////
 case/esac vs if
 ---------------
diff --git a/test/completion/acroread.exp b/test/completion/acroread.exp
index c3635ae8..ccf00537 100644
--- a/test/completion/acroread.exp
+++ b/test/completion/acroread.exp
@@ -2,7 +2,7 @@ set test "Completion via _filedir_xspec() should be installed"
 set cmd "complete -p acroread"
 send "$cmd\r"
 
-set expected "^$cmd\r\ncomplete -o filenames -F _filedir_xspec acroread\r\n/@$"
+set expected "^$cmd\r\ncomplete -F _filedir_xspec acroread\r\n/@$"
 expect {
     -re $expected  { pass "$test" }
     -re /@ { fail "$test at prompt" }
diff --git a/test/lib/completions/chown.exp b/test/lib/completions/chown.exp
index a34cbe90..bc1a8c7f 100644
--- a/test/lib/completions/chown.exp
+++ b/test/lib/completions/chown.exp
@@ -40,8 +40,7 @@ if {!$failed_find_unique_completion} {
     assert_complete $fulluser:$fullgroup "chown $fulluser:$partgroup"
     sync_after_int
 
-    # One slash should work correctly (doubled here for tcl).
-    assert_complete $fulluser\\:$fullgroup "chown $fulluser\\:$partgroup"
+    assert_complete "dot.user:$fullgroup" "chown dot.user:$partgroup"
     sync_after_int
 
     foreach prefix {
diff --git a/test/lib/completions/screen.exp b/test/lib/completions/screen.exp
index a1a20138..b8145894 100644
--- a/test/lib/completions/screen.exp
+++ b/test/lib/completions/screen.exp
@@ -17,33 +17,8 @@ assert_complete_any "screen -"
 sync_after_int
 
 
-set test "-c should complete files/dirs"
-set dir fixtures/shared/default
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
-set cmd "screen -c "
-set expected {bar {bar bar.d} foo {foo.d}}
-send "$cmd\t"
-expect -ex "$cmd"
-expect {
-    -re "\r\nbar\\s+bar bar.d/\\s+foo\\s+foo.d/"  { pass "$test" }
-        # Directories might not be suffixed with a slash (/).  This is because
-        # _filedir only works if `-o filenames' is in effect, which isn't the
-        # case for `screen' on bash-3, so an expected failure (xfail)
-    -re "\r\nbar\\s+bar bar.d\\s+foo\\s+foo.d" { 
-        if {[lindex $::BASH_VERSINFO 0] < 4} {xfail "$test"} {fail "$test"}
-    }
-    -re "\r\nbar\\s+bar\\\\ bar.d/\\s+foo\\s+foo.d/" {
-        # On bash-3, the space in `bar bar.d' is escaped with a backslash
-        # as a side-effect of emulating `-o filenames'.
-        if {[lindex $::BASH_VERSINFO 0] <= 3} {pass "$test"} {fail "$test"}
-    }
-    -re $prompt { unresolved "$test at prompt" }
-    default { unresolved "$test" }
-}
-sync_after_int $prompt
-assert_bash_exec {cd "$TESTDIR"}
-
+assert_complete {bar "bar bar.d/" foo foo.d/} \
+    "screen -c fixtures/shared/default/" "-c should complete files/dirs"
 
 
 sync_after_int
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 65059721..fecdaf12 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -55,21 +55,10 @@ assert_complete_dir $expected "sftp -F spaced\\ \\ conf " $dir
 sync_after_int
 
 
-set test "-F should complete filename"
 set dir fixtures/sftp
 set prompt "/$dir/@"
 assert_bash_exec "cd $dir" "" $prompt
-set cmd "sftp -Fsp"
-send "$cmd\t"
-expect -ex "$cmd"
-expect {
-    -ex "aced\\ \\ conf"  { pass "$test" }
-        # _filedir works only if `-o filenames' is in effect, which isn't the
-        # case for `sftp'
-    -re "aced  conf" { xfail "$test" }
-    -re $prompt { unresolved "$test at prompt" }
-    default { unresolved "$test" }
-}
+assert_complete "-Fspaced\\ \\ conf" "sftp -Fsp" "-F should complete filename"
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index 7a511eab..a5a16994 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -72,22 +72,9 @@ set test "-F should complete filename"
 set dir fixtures/ssh
 set prompt "/$dir/@"
 assert_bash_exec "cd $dir" "" $prompt
-set cmd "ssh -Fsp"
-send "$cmd\t"
-expect -ex "$cmd"
-expect {
-    -ex "aced\\ \\ conf"  { pass "$test" }
-        # _filedir works only if `-o filenames' is in effect, which isn't the
-        # case for `ssh'
-    -re "aced  conf" { xfail "$test" }
-    -re $prompt { unresolved "$test at prompt" }
-    default { unresolved "$test" }
-}
+assert_complete "-Fspaced\\ \\ conf" "ssh -Fsp" "-F should complete filename"
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
 
-sync_after_int
-
-
 teardown

From 7a174c0e1f7d8ff9ecdc478ef8acfa35bdf11b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 1 Nov 2010 21:39:03 +0200
Subject: [PATCH 146/214] Add ip completion (Debian: #600617).

---
 CHANGES                     |   4 +-
 completions/Makefile.am     |   1 +
 completions/iproute2        | 285 ++++++++++++++++++++++++++++++++++++
 test/completion/ip.exp      |   1 +
 test/lib/completions/ip.exp |  20 +++
 5 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 completions/iproute2
 create mode 100644 test/completion/ip.exp
 create mode 100644 test/lib/completions/ip.exp

diff --git a/CHANGES b/CHANGES
index cee60a94..0b39ca6b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,8 +9,8 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, iftop, lrzip, POSIX sh, sha{,224,256,384,512}sum, sysbench,
-    tune2fs, xmodmap, and xrdb completions.
+    filefrag, iftop, ip (Debian: #600617), lrzip, POSIX sh,
+    sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 5c904295..5ca478fe 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -59,6 +59,7 @@ bashcomp_DATA = abook \
 		info \
 		iptables \
 		ipmitool \
+		iproute2 \
 		ipsec \
 		ipv6calc \
 		isql \
diff --git a/completions/iproute2 b/completions/iproute2
new file mode 100644
index 00000000..f5d7bbd9
--- /dev/null
+++ b/completions/iproute2
@@ -0,0 +1,285 @@
+# iproute2 tools completion
+
+have ip &&
+_ip()
+{
+    COMPREPLY=()
+    local cur prev words cword
+    _get_comp_words_by_ref cur prev words cword
+
+    case $prev in
+        -V|-Version|-rc|-rcvbuf)
+            return 0
+            ;;
+        -f|-family)
+            COMPREPLY=( $( compgen -W 'inet inet6 ipx dnet link' -- "$cur" ) )
+            return 0
+            ;;
+        -b|-batch)
+            _filedir
+            return 0
+            ;;
+        -force)
+            COMPREPLY=( $( compgen -W '-batch' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    local subcword cmd subcmd
+    for (( subcword=1; subcword < ${#words[@]}-1; subcword++ )); do
+        [[ ${words[subcword]} == -b?(atch) ]] && return 0
+        [[ -n $cmd ]] && subcmd=${words[subcword]} && break
+        [[ ${words[subcword]} != -* && \
+                ${words[subcword-1]} != -@(f?(amily)|rc?(vbuf)) ]] && \
+            cmd=${words[subcword]}
+    done
+
+    if [[ -z $cmd ]]; then
+        case $cur in
+            -*)
+                local c="-Version -statistics -details -resolve -family
+                    -oneline -timestamp -batch -rcvbuf"
+                [[ $cword -eq 1 ]] && c="$c -force"
+                COMPREPLY=( $( compgen -W "$c" -- "$cur" ) )
+                return 0
+                ;;
+            *)
+                COMPREPLY=( $( compgen -W "help $( ip help 2>&1 | \
+                    sed -e '/OBJECT := /,/}/!d' \
+                        -e 's/.*{//' -e 's/}.*//' -e 's/|//g' )" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    [[ $subcmd == help ]] && return 0
+
+    case $cmd in
+        link)
+            case $subcmd in
+                add)
+                    # TODO
+                    ;;
+                delete)
+                    case $(($cword-$subcword)) in
+                        1)
+                            _available_interfaces
+                            ;;
+                        2)
+                            COMPREPLY=( $( compgen -W 'type' -- "$cur" ) )
+                            ;;
+                        3)
+                            [[ $prev == type ]] && \
+                                COMPREPLY=( $( compgen -W 'vlan veth vcan dummy
+                                    ifb macvlan can' -- "$cur" ) )
+                            ;;
+                    esac
+                    ;;
+                set)
+                    if [[ $cword-$subcword -eq 1 ]]; then
+                        _available_interfaces
+                    else
+                        case $prev in
+                            arp|dynamic|multicast|allmulticast|promisc|\
+                            trailers)
+                                COMPREPLY=( $( compgen -W 'on off' \
+                                    -- "$cur" ) )
+                                ;;
+                            txqueuelen|name|address|broadcast|mtu|netns|alias)
+                                ;;
+                            *)
+                                local c="arp dynamic multicast allmulticast
+                                    promisc trailers txqueuelen name address
+                                    broadcast mtu netns alias"
+                                [[ $prev != @(up|down) ]] && c="$c up down"
+                                COMPREPLY=( $( compgen -W "$c" -- "$cur" ) )
+                                ;;
+                        esac
+                    fi
+                    ;;
+                show)
+                    [[ $cword -eq $subcword+1 ]] && _available_interfaces
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help add delete set show' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        addr)
+            case $subcmd in
+                add|change|replace)
+                    # TODO
+                    ;;
+                del)
+                    # TODO
+                    ;;
+                show|flush)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help add change replace del
+                            show flush' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        addrlabel)
+            case $subcmd in
+                list|add|del|flush)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help list add del flush' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        route)
+            case $subcmd in
+                list|flush)
+                    # TODO
+                    ;;
+                get)
+                    # TODO
+                    ;;
+                add|del|change|append|replace|monitor)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help list flush get add del
+                            change append replace monitor' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        rule)
+            case $subcmd in
+                list|add|del|flush)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help list add del flush' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        neigh)
+            case $subcmd in
+                add|del|change|replace)
+                    # TODO
+                    ;;
+                show|flush)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help add del change replace
+                            show flush' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        ntable)
+            case $subcmd in
+                change)
+                    # TODO
+                    ;;
+                show)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help change show' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        tunnel)
+            case $subcmd in
+                add|change|del|show|prl|6rd)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help add change del show prl
+                            6rd' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        maddr)
+            case $subcmd in
+                add|del)
+                    # TODO
+                    ;;
+                show)
+                    if [[ $cword -eq $subcword+1 || $prev == dev ]]; then
+                        _available_interfaces
+                        [[ $prev != dev ]] && \
+                            COMPREPLY=( $( compgen -W '${COMPREPLY[@]} dev' \
+                            -- "$cur" ) )
+                    fi
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help add del show' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+        mroute)
+            case $subcmd in
+                show)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help show' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+         monitor)
+            case $subcmd in
+                all) ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'help all' -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+
+         xfrm)
+            case $subcmd in
+                state|policy|monitor)
+                    # TODO
+                    ;;
+                *)
+                    [[ $cword -eq $subcword ]] && \
+                        COMPREPLY=( $( compgen -W 'state policy monitor' \
+                        -- "$cur" ) )
+                    ;;
+            esac
+            ;;
+    esac
+} &&
+complete -F _ip ip
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/ip.exp b/test/completion/ip.exp
new file mode 100644
index 00000000..e80841e8
--- /dev/null
+++ b/test/completion/ip.exp
@@ -0,0 +1 @@
+assert_source_completions ip
diff --git a/test/lib/completions/ip.exp b/test/lib/completions/ip.exp
new file mode 100644
index 00000000..8f45f6a3
--- /dev/null
+++ b/test/lib/completions/ip.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ip "
+
+
+sync_after_int
+
+
+teardown

From dfb84064a46d5393c69cf3221b03c96caef5314a Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 3 Nov 2010 19:55:38 +0100
Subject: [PATCH 147/214] Fix _tilde with new _compopt_o_filenames

---
 bash_completion | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bash_completion b/bash_completion
index de9daefa..0e94b4d1 100644
--- a/bash_completion
+++ b/bash_completion
@@ -789,6 +789,7 @@ _tilde() {
     local result=0
     # Does $1 start with tilde (~) and doesn't contain slash (/)?
     if [[ ${1:0:1} == "~" && $1 == ${1//\/} ]]; then
+        _compopt_o_filenames
         # Try generate username completions
         COMPREPLY=( $( compgen -P '~' -u "${1#\~}" ) )
         result=${#COMPREPLY[@]}

From 642ef5344f9769fdeb273e496a152b205dd71376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 3 Nov 2010 21:11:07 +0200
Subject: [PATCH 148/214] Add basic growisofs completion.

---
 CHANGES                            |  2 +-
 completions/Makefile.am            |  1 +
 completions/dvd+rw-tools           | 47 ++++++++++++++++++++++++++++++
 test/completion/growisofs.exp      |  1 +
 test/lib/completions/growisofs.exp | 20 +++++++++++++
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 completions/dvd+rw-tools
 create mode 100644 test/completion/growisofs.exp
 create mode 100644 test/lib/completions/growisofs.exp

diff --git a/CHANGES b/CHANGES
index 0b39ca6b..47fdab5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, iftop, ip (Debian: #600617), lrzip, POSIX sh,
+    filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, POSIX sh,
     sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 5ca478fe..51d9eb43 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -35,6 +35,7 @@ bashcomp_DATA = abook \
 		dpkg \
 		dselect \
 		dsniff \
+		dvd+rw-tools \
 		e2fsprogs \
 		findutils \
 		freeciv \
diff --git a/completions/dvd+rw-tools b/completions/dvd+rw-tools
new file mode 100644
index 00000000..f37781ee
--- /dev/null
+++ b/completions/dvd+rw-tools
@@ -0,0 +1,47 @@
+# dvd+rw-tools completions
+
+have growisofs &&
+_growisofs()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -version|-speed)
+            return 0
+            ;;
+        -Z|-M)
+            compopt -o nospace &>/dev/null
+            _dvd_devices
+            return 0
+            ;;
+        /?(r)dev/*)
+            if [[ $cur == =* ]] ; then
+                # e.g. /dev/dvd=foo.iso, /dev/dvdrw=/dev/zero
+                cur="${cur#=}"
+                _filedir
+                return 0
+            fi
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        # TODO: mkisofs options
+        COMPREPLY=( $( compgen -W '-dvd-compat -overburn -speed= -Z -M' \
+            -- "$cur" ) )
+        [[ ${COMPREPLY[@]} == *= ]] && compopt -o nospace &>/dev/null
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _growisofs growisofs
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/growisofs.exp b/test/completion/growisofs.exp
new file mode 100644
index 00000000..57cb991b
--- /dev/null
+++ b/test/completion/growisofs.exp
@@ -0,0 +1 @@
+assert_source_completions growisofs
diff --git a/test/lib/completions/growisofs.exp b/test/lib/completions/growisofs.exp
new file mode 100644
index 00000000..0f2a0ec7
--- /dev/null
+++ b/test/lib/completions/growisofs.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "growisofs "
+
+
+sync_after_int
+
+
+teardown

From 8daa291d6aee2dc089783926b8ea3f11c90ec296 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 3 Nov 2010 22:00:12 +0100
Subject: [PATCH 149/214] Split test in two for ls.exp, expanding ~part
 Depending on if user has or hasn't an existing home dir, the test should
 respond differently, but it's useful if both tests execute.

---
 test/lib/completions/ls.exp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index a7537dc7..fb897526 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -19,12 +19,25 @@ if {[assert_exec {ls --help} "" "" "unsupported"]} {
 sync_after_int
 
 
-set test "~part should complete to ~full"
-assert_bash_exec {compgen -u} {} /@ users
+set test "~part should complete to ~full/"
+# Create list of users, having a home dir
+assert_bash_exec {for u in $(compgen -u); do \
+    eval test -d ~$u && echo $u; unset u; done} {} /@ users
 find_unique_completion_pair $users part full
 # If home directory exists, append slash "/", else space " "
-set trail [expr {[llength [glob -nocomplain ~$full]] ? "/" : " "}]
-assert_complete "~$full$trail" "ls ~$part" $test
+assert_complete "~$full/" "ls ~$part" $test
+
+
+sync_after_int
+
+
+set test "~part should complete to ~full<space>"
+# Create list of users, having non-existing home dir
+assert_bash_exec {for u in $(compgen -u); do \
+    eval test -d ~$u || echo $u; unset u; done} {} /@ users
+find_unique_completion_pair $users part full
+# If home directory exists, append slash "/", else space " "
+assert_complete "~$full " "ls ~$part" $test
 
 
 sync_after_int

From 99d8cf290d6731a319378ad2176affeb108d80f6 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 3 Nov 2010 22:06:12 +0100
Subject: [PATCH 150/214] (testsuite) Fix comment

---
 test/lib/completions/ls.exp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index fb897526..5aafddb4 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -19,24 +19,22 @@ if {[assert_exec {ls --help} "" "" "unsupported"]} {
 sync_after_int
 
 
-set test "~part should complete to ~full/"
-# Create list of users, having a home dir
+set test "~part should complete to ~full/ if existing dir"
+# Create list of users, having existing home dir
 assert_bash_exec {for u in $(compgen -u); do \
     eval test -d ~$u && echo $u; unset u; done} {} /@ users
 find_unique_completion_pair $users part full
-# If home directory exists, append slash "/", else space " "
 assert_complete "~$full/" "ls ~$part" $test
 
 
 sync_after_int
 
 
-set test "~part should complete to ~full<space>"
+set test "~part should complete to ~full<space> if non-existing dir"
 # Create list of users, having non-existing home dir
 assert_bash_exec {for u in $(compgen -u); do \
     eval test -d ~$u || echo $u; unset u; done} {} /@ users
 find_unique_completion_pair $users part full
-# If home directory exists, append slash "/", else space " "
 assert_complete "~$full " "ls ~$part" $test
 
 

From 325b1c2fea5ccb69bb8ca4649d4b50101f78f568 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 3 Nov 2010 22:34:35 +0100
Subject: [PATCH 151/214] (testsuite) Added expected failure for perldoc
 options completion perldoc options don't complete anymore

---
 test/lib/completions/perldoc.exp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index b084dda2..75858978 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -11,6 +11,25 @@ proc teardown {} {
 setup
 
 
+set test "perldoc should complete options"
+set cmd "perldoc -"
+send "$cmd\t"
+expect -ex "$cmd"
+# We can't anchor on $, simulate typing a magical string instead.
+set endguard "Magic End Guard"
+send "$endguard"
+expect {
+    # NOTE: Expected failure: After switching to pure perl perldoc completion,
+    #       the completion of options has disappeared.  See commit 07b7ddd1d
+    #       and Alioth #312800
+    -re "^$endguard$" { xfail "$test" }
+    -re "-h.*$endguard$" { pass "$test" }
+}
+
+
+sync_after_int
+
+
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"

From edce099a45b69047e50832fc73a4e9cd9a81b318 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Thu, 4 Nov 2010 22:40:53 +0100
Subject: [PATCH 152/214] (install) Fix relocated helpers dir

---
 completions/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/completions/Makefile.am b/completions/Makefile.am
index 51d9eb43..ead561b3 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = helpers
 bashcomp_DATA = abook \
 		ant \
 		apache2ctl \

From 6172ab425025d805bde196661474e138a38d5197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 5 Nov 2010 18:46:56 +0200
Subject: [PATCH 153/214] Remove autogen.sh, plain autoreconf (-i) is enough.

---
 autogen.sh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 6868f2de..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-autoreconf -i
-rm -rf autom4te.cache/

From 46997c69c8eb41a29dd64ea6c90a8af992119b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 5 Nov 2010 18:52:19 +0200
Subject: [PATCH 154/214] Don't bother creating the gzipped dist tarball, the
 bzip2 one is enough.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6f516f99..b444e7a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
-AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 -Wall -Werror])
+AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 no-dist-gzip -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
 AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])

From ed3f21b0135794cbfd4a3460e685d2f38e7f1511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 5 Nov 2010 19:46:53 +0200
Subject: [PATCH 155/214] Create and remove the test/{log,tmp} dirs when
 appropriate.

---
 test/Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/Makefile.am b/test/Makefile.am
index d955be8a..9f7e8254 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,3 +6,9 @@ EXTRA_DIST = completion \
 	     fixtures \
 	     lib \
 	     unit
+
+all:
+	$(mkdir_p) log tmp
+
+distclean-local:
+	rm -rf log tmp

From 8dc1e86a7a8d63be78e38cb3644e7042ac390cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 5 Nov 2010 19:47:25 +0200
Subject: [PATCH 156/214] Don't source bash-completion.log when running "make
 check".

I wonder why does such a file end up in our completions dir, but it
looks like one created by "make check" invocations.
---
 test/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 9f7e8254..9dab2190 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
 DEJATOOL = completion install unit
-AM_RUNTESTFLAGS = --outdir log
+AM_RUNTESTFLAGS = --outdir log --ignore $(PACKAGE).log
 
 EXTRA_DIST = completion \
 	     config \

From d68b471905765084b9dcad59604be510edc68ec3 Mon Sep 17 00:00:00 2001
From: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Date: Fri, 5 Nov 2010 01:19:14 +0000
Subject: [PATCH 157/214] List both attached and detached sesstions for screen
 -x

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
---
 completions/screen | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/completions/screen b/completions/screen
index cabc4b7a..1dc7a597 100644
--- a/completions/screen
+++ b/completions/screen
@@ -36,11 +36,16 @@ _screen()
             _screen_sessions 'Detached'
             return 0
             ;;
-        -[dDx])
+        -[dD])
             # list attached
             _screen_sessions 'Attached'
             return 0
             ;;
+        -x)
+            # list both
+            _screen_sessions
+            return 0
+            ;;
         -s)
             _shells
             return 0

From b7937bf2f0099b9cd35c65f38f5662f0a11cd938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 5 Nov 2010 21:28:27 +0200
Subject: [PATCH 158/214] Simplify _screen_sessions(), use compgen -W, fixes
 partial completion.

---
 completions/screen | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/completions/screen b/completions/screen
index 1dc7a597..952d9766 100644
--- a/completions/screen
+++ b/completions/screen
@@ -3,16 +3,9 @@
 have screen &&
 _screen_sessions()
 {
-    local pattern
-
-    if [ -n "$1" ]; then
-        pattern=".*$1.*"
-    else
-        pattern=".*"
-    fi
-
-    COMPREPLY=( $( command screen -ls | sed -ne \
-        's|^['$'\t'']\{1,\}\('"$cur"'[0-9]\{1,\}\.[^'$'\t'']\{1,\}\)'"$pattern"'$|\1|p' ) )
+    COMPREPLY=( $( compgen -W "$( command screen -ls | sed -ne \
+        's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p' )" \
+        -- "$cur" ) )
 } &&
 _screen()
 {

From 0367d0bf57fb058b6f7fdc7bc9902de7bf5bbd26 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 5 Nov 2010 21:11:57 +0100
Subject: [PATCH 159/214] (testsuite) Moved tool_start() code to tool_init()
 ${tool}_start was called from within `config/default_exp', but this proves to
 be error-prone, because DejaGnu isn't fully initialized at that point,
 causing an error when calling one of the DejaGnu methods
 pass/fail/unsupported/xfail/unresolved/untested:

    can't read "multipass_name": no such variable

The right way seems to be calling ${tool}_start() from
${tool}_init().
---
 test/config/default.exp |  6 ------
 test/lib/completion.exp |  8 ++++++++
 test/lib/library.exp    | 14 ++------------
 test/lib/unit.exp       |  8 ++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/config/default.exp b/test/config/default.exp
index 53e0185e..1eb47a2c 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -19,9 +19,3 @@ expect_after {
         }   
     }   
 }
-
-
-# Call tool_start(), if available
-if { [info procs "${tool}_start"] != "" } {
-    ${tool}_start
-}
diff --git a/test/lib/completion.exp b/test/lib/completion.exp
index ea2a3d8d..b7563af6 100644
--- a/test/lib/completion.exp
+++ b/test/lib/completion.exp
@@ -6,6 +6,14 @@ proc completion_exit {} {
 }
 
 
+proc completion_init {test_file_name} {
+    # Call completion_start() only once
+    if {! [info exists ::BASH_VERSINFO]} {
+        completion_start
+    }
+}
+
+
 proc completion_start {} {
     start_interactive_test
 }
diff --git a/test/lib/library.exp b/test/lib/library.exp
index b68f4132..bc5de50b 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -34,24 +34,14 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
         ]
     ]
     if {$out == -1 && [string length $results] > 0} {
-        # Is DejaGnu fully initialized, i.e. is "fail" method available?
-        if {[info exists multipass_name]} {
-            fail "ERROR Unexpected output from bash command \"$title\""
-        }
-        send_user "ERROR Unexpected output from bash command \"$title\":\n$results"
+        fail "ERROR Unexpected output from bash command \"$title\""
     }
 
     set cmd "echo $?"
     send "$cmd\r"
     expect {
         -ex "$cmd\r\n0\r\n$prompt" {}
-        $prompt {
-            # Is DejaGnu fully initialized, i.e. is "fail" method available?
-            if {[info exists multipass_name]} {
-                fail "ERROR executing bash command \"$title\""
-            }
-            send_user "ERROR executing bash command \"$title\""
-        }
+        $prompt {fail "ERROR executing bash command \"$title\""}
     }
 }
 
diff --git a/test/lib/unit.exp b/test/lib/unit.exp
index de870332..935997b6 100644
--- a/test/lib/unit.exp
+++ b/test/lib/unit.exp
@@ -7,6 +7,14 @@ proc unit_exit {} {
 }
 
 
+proc unit_init {test_file_name} {
+    # Call unit_start() only once
+    if {! [info exists ::BASH_VERSINFO]} {
+        unit_start
+    }
+}
+
+
 proc unit_start {} {
     start_interactive_test
 }

From de51dd3a89016453f765820b93af73bd80ad78cc Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 5 Nov 2010 21:28:48 +0100
Subject: [PATCH 160/214] (testsuite) Prepend relative files with $::srcdir in
 an attempt to be able to run the tests successfully from within autotools'
 `make distcheck'.

---
 test/lib/completion.exp | 2 +-
 test/lib/library.exp    | 4 ++--
 test/lib/unit.exp       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/lib/completion.exp b/test/lib/completion.exp
index b7563af6..88e92d50 100644
--- a/test/lib/completion.exp
+++ b/test/lib/completion.exp
@@ -1,4 +1,4 @@
-source ${srcdir}/lib/library.exp
+source $::srcdir/lib/library.exp
 
 
 proc completion_exit {} {
diff --git a/test/lib/library.exp b/test/lib/library.exp
index bc5de50b..c69aa2bb 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -858,8 +858,8 @@ proc start_bash {} {
     set TESTDIR [pwd]
     # If `--tool_exec' option not specified, use "bash"
     if {! [info exists TOOL_EXECUTABLE]} {set TOOL_EXECUTABLE bash}
-    exp_spawn $TOOL_EXECUTABLE --rcfile config/bashrc
-    assert_bash_exec {} "$TOOL_EXECUTABLE --rcfile config/bashrc"
+    exp_spawn $TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc
+    assert_bash_exec {} "$TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc"
     # Bash < 3.2.41 has a bug where 'history' disappears from SHELLOPTS
     # whenever a shopt setting is sourced or eval'ed.  Disabling 'history'
     # makes it not show in tests "Environment should not be modified"
diff --git a/test/lib/unit.exp b/test/lib/unit.exp
index 935997b6..e113e1b5 100644
--- a/test/lib/unit.exp
+++ b/test/lib/unit.exp
@@ -1,4 +1,4 @@
-source lib/library.exp
+source $::srcdir/lib/library.exp
 
 
 proc unit_exit {} {

From 83fc41d5b1eae79f74fd4df0a74bfb27336e4776 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sat, 6 Nov 2010 23:42:22 +0100
Subject: [PATCH 161/214] use same indentation convention as for bash code

---
 completions/helpers/perldoc | 118 ++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/completions/helpers/perldoc b/completions/helpers/perldoc
index a366eed7..2b7b7eb5 100755
--- a/completions/helpers/perldoc
+++ b/completions/helpers/perldoc
@@ -5,91 +5,91 @@ use File::Spec::Functions qw( rel2abs catdir catfile no_upwards );
 sub uniq { my %seen; grep { not $seen{$_}++ } @_ }
 
 sub get_command_line {
-	my $comp = substr $ENV{'COMP_LINE'}, 0, $ENV{'COMP_POINT'};
-	return split /[ \t]+/, $comp, -1; # if not good enough, use Text::ParseWords
+    my $comp = substr $ENV{'COMP_LINE'}, 0, $ENV{'COMP_POINT'};
+    return split /[ \t]+/, $comp, -1; # if not good enough, use Text::ParseWords
 }
 
 sub slurp_dir {
-	opendir my $dir, shift or return;
-	no_upwards readdir $dir;
+    opendir my $dir, shift or return;
+    no_upwards readdir $dir;
 }
 
 sub suggestion_from_name {
-	my ( $file_rx, $path, $name ) = @_;
-	return if not $name =~ /$file_rx/;
-	return $name.'::' if -d catdir $path, $name;
-	return $1;
+    my ( $file_rx, $path, $name ) = @_;
+    return if not $name =~ /$file_rx/;
+    return $name.'::' if -d catdir $path, $name;
+    return $1;
 }
 
 sub suggestions_from_path {
-	my ( $file_rx, $path ) = @_;
-	map { suggestion_from_name $file_rx, $path, $_ } slurp_dir $path;
+    my ( $file_rx, $path ) = @_;
+    map { suggestion_from_name $file_rx, $path, $_ } slurp_dir $path;
 }
 
 sub get_package_suggestions {
-	my ( $pkg ) = @_;
+    my ( $pkg ) = @_;
 
-	my @segment = split /::|:\z/, $pkg, -1;
-	my $file_rx = qr/\A(${\quotemeta pop @segment}\w*)(?:\.pm|\.pod)?\z/;
+    my @segment = split /::|:\z/, $pkg, -1;
+    my $file_rx = qr/\A(${\quotemeta pop @segment}\w*)(?:\.pm|\.pod)?\z/;
 
-	my $home = rel2abs $ENV{'HOME'};
-	my $cwd = rel2abs do { require Cwd; Cwd::cwd() };
+    my $home = rel2abs $ENV{'HOME'};
+    my $cwd = rel2abs do { require Cwd; Cwd::cwd() };
 
-	my @suggestion =
-		map { suggestions_from_path $file_rx, $_ }
-		uniq map { catdir $_, @segment }
-		grep { $home ne $_ and $cwd ne $_ }
-		map { $_, ( catdir $_, 'pod' ) }
-		map { rel2abs $_ }
-		@INC;
+    my @suggestion =
+        map { suggestions_from_path $file_rx, $_ }
+        uniq map { catdir $_, @segment }
+        grep { $home ne $_ and $cwd ne $_ }
+        map { $_, ( catdir $_, 'pod' ) }
+        map { rel2abs $_ }
+        @INC;
 
-	# fixups
-	if ( $pkg eq '' ) {
-		my $total = @suggestion;
-		@suggestion = grep { not /^perl/ } @suggestion;
-		my $num_hidden = $total - @suggestion;
-		push @suggestion, "perl* ($num_hidden hidden)" if $num_hidden;
-	}
-	elsif ( $pkg =~ /(?<!:):\z/ ) {
-		@suggestion = map { ":$_" } @suggestion;
-	}
+    # fixups
+    if ( $pkg eq '' ) {
+        my $total = @suggestion;
+        @suggestion = grep { not /^perl/ } @suggestion;
+        my $num_hidden = $total - @suggestion;
+        push @suggestion, "perl* ($num_hidden hidden)" if $num_hidden;
+    }
+    elsif ( $pkg =~ /(?<!:):\z/ ) {
+        @suggestion = map { ":$_" } @suggestion;
+    }
 
-	return @suggestion;
+    return @suggestion;
 }
 
 sub get_function_suggestions {
-	my ( $func ) = @_;
+    my ( $func ) = @_;
 
-	my $perlfunc;
-	for ( @INC, undef ) {
-		return if not defined;
-		$perlfunc = catfile $_, qw( pod perlfunc.pod );
-		last if -r $perlfunc;
-	}
+    my $perlfunc;
+    for ( @INC, undef ) {
+        return if not defined;
+        $perlfunc = catfile $_, qw( pod perlfunc.pod );
+        last if -r $perlfunc;
+    }
 
-	open my $fh, '<', $perlfunc or return;
+    open my $fh, '<', $perlfunc or return;
 
-	my @suggestion;
-	my $nest_level = -1;
-	while ( <$fh> ) {
-		next if 1 .. /^=head2 Alphabetical Listing of Perl Functions$/;
-		++$nest_level if /^=over/;
-		--$nest_level if /^=back/;
-		next if $nest_level;
-		push @suggestion, /^=item (-?\w+)/;
-	}
+    my @suggestion;
+    my $nest_level = -1;
+    while ( <$fh> ) {
+        next if 1 .. /^=head2 Alphabetical Listing of Perl Functions$/;
+        ++$nest_level if /^=over/;
+        --$nest_level if /^=back/;
+        next if $nest_level;
+        push @suggestion, /^=item (-?\w+)/;
+    }
 
-	my $func_rx = qr/\A${\quotemeta $func}/;
+    my $func_rx = qr/\A${\quotemeta $func}/;
 
-	return grep { /$func_rx/ } @suggestion;
+    return grep { /$func_rx/ } @suggestion;
 }
 
 sub usage {
-	die map "\n$_\n", (
-		"To use, issue the following command in bash:",
-		"\tcomplete -C perldoc-complete -o nospace -o default perldoc",
-		"You probably want to put that line in your ~/.bashrc file.\n",
-	);
+    die map "\n$_\n", (
+        "To use, issue the following command in bash:",
+        "\tcomplete -C perldoc-complete -o nospace -o default perldoc",
+        "You probably want to put that line in your ~/.bashrc file.\n",
+    );
 }
 
 usage() if not exists $ENV{'COMP_LINE'};
@@ -98,5 +98,5 @@ my ( $cmd, @arg ) = get_command_line();
 my $word = pop @arg;
 
 print "$_\n" for ( @arg and @arg[-1] eq '-f' )
-	? get_function_suggestions( $word )
-	: get_package_suggestions( $word );
+    ? get_function_suggestions( $word )
+    : get_package_suggestions( $word );

From 1f0dd273f7604bf0102987b64894250c31a66bac Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sat, 6 Nov 2010 23:42:38 +0100
Subject: [PATCH 162/214] no need for usage output

---
 completions/helpers/perldoc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/completions/helpers/perldoc b/completions/helpers/perldoc
index 2b7b7eb5..6e7a16d6 100755
--- a/completions/helpers/perldoc
+++ b/completions/helpers/perldoc
@@ -84,16 +84,6 @@ sub get_function_suggestions {
     return grep { /$func_rx/ } @suggestion;
 }
 
-sub usage {
-    die map "\n$_\n", (
-        "To use, issue the following command in bash:",
-        "\tcomplete -C perldoc-complete -o nospace -o default perldoc",
-        "You probably want to put that line in your ~/.bashrc file.\n",
-    );
-}
-
-usage() if not exists $ENV{'COMP_LINE'};
-
 my ( $cmd, @arg ) = get_command_line();
 my $word = pop @arg;
 

From 2d58e69ef9a253726c0a7bbe5d5a201e10308565 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sat, 6 Nov 2010 23:54:17 +0100
Subject: [PATCH 163/214] rework to match original bash function more closely,
 including options completion

---
 completions/helpers/perldoc | 50 ++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/completions/helpers/perldoc b/completions/helpers/perldoc
index 6e7a16d6..6d91dbdc 100755
--- a/completions/helpers/perldoc
+++ b/completions/helpers/perldoc
@@ -57,8 +57,7 @@ sub get_package_suggestions {
     return @suggestion;
 }
 
-sub get_function_suggestions {
-    my ( $func ) = @_;
+sub get_functions {
 
     my $perlfunc;
     for ( @INC, undef ) {
@@ -69,24 +68,51 @@ sub get_function_suggestions {
 
     open my $fh, '<', $perlfunc or return;
 
-    my @suggestion;
+    my @functions;
     my $nest_level = -1;
     while ( <$fh> ) {
         next if 1 .. /^=head2 Alphabetical Listing of Perl Functions$/;
         ++$nest_level if /^=over/;
         --$nest_level if /^=back/;
         next if $nest_level;
-        push @suggestion, /^=item (-?\w+)/;
+        push @functions, /^=item (-?\w+)/;
     }
 
-    my $func_rx = qr/\A${\quotemeta $func}/;
-
-    return grep { /$func_rx/ } @suggestion;
+    return @functions;
 }
 
-my ( $cmd, @arg ) = get_command_line();
-my $word = pop @arg;
+sub filter {
+    my ($word, @list) = @_;
 
-print "$_\n" for ( @arg and @arg[-1] eq '-f' )
-    ? get_function_suggestions( $word )
-    : get_package_suggestions( $word );
+    my $pattern = qr/\A${\quotemeta $word}/;
+
+    return grep { /$pattern/ } @list;
+}
+
+sub get_suggestions {
+    my (@args) = @_;
+    my $word = pop @args;
+
+    if (@args) {
+        if ($args[-1] eq '-f') {
+            return filter(
+                $word,
+                get_functions
+            );
+        }
+    }
+
+    if ($word =~ /^-/) {
+        return filter(
+            $word,
+            qw/-h -D -t -u -m -l -F -i -v -V -T -r -d -o -M -w -n -X -L/
+        );
+
+    } else {
+        return get_package_suggestions($word);
+    }
+}
+
+my ($cmd, @args) = get_command_line();
+
+print "$_\n" for get_suggestions(@args);

From fd8ade00774b26ccfb3466f58c4d67cd09b2af15 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 7 Nov 2010 01:13:14 +0100
Subject: [PATCH 164/214] rename perldoc helper to perl, as it is now a generic
 perl completion handler, and use it for perl completion as well

---
 completions/helpers/Makefile.am       |   2 +-
 completions/helpers/{perldoc => perl} | 101 +++++++++++++++++++++++---
 completions/perl                      |  50 +------------
 3 files changed, 93 insertions(+), 60 deletions(-)
 rename completions/helpers/{perldoc => perl} (55%)

diff --git a/completions/helpers/Makefile.am b/completions/helpers/Makefile.am
index 991cfce0..98fccefe 100644
--- a/completions/helpers/Makefile.am
+++ b/completions/helpers/Makefile.am
@@ -1,3 +1,3 @@
-helpers_SCRIPTS = perldoc
+helpers_SCRIPTS = perl
 
 EXTRA_DIST = $(helpers_SCRIPTS)
diff --git a/completions/helpers/perldoc b/completions/helpers/perl
similarity index 55%
rename from completions/helpers/perldoc
rename to completions/helpers/perl
index 6d91dbdc..a0468440 100755
--- a/completions/helpers/perldoc
+++ b/completions/helpers/perl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 use strict;
-use File::Spec::Functions qw( rel2abs catdir catfile no_upwards );
+use File::Spec::Functions qw( rel2abs catdir catfile no_upwards splitpath );
 
 sub uniq { my %seen; grep { not $seen{$_}++ } @_ }
 
@@ -27,7 +27,7 @@ sub suggestions_from_path {
 }
 
 sub get_package_suggestions {
-    my ( $pkg ) = @_;
+    my ( $pkg, $prefix ) = @_;
 
     my @segment = split /::|:\z/, $pkg, -1;
     my $file_rx = qr/\A(${\quotemeta pop @segment}\w*)(?:\.pm|\.pod)?\z/;
@@ -54,9 +54,49 @@ sub get_package_suggestions {
         @suggestion = map { ":$_" } @suggestion;
     }
 
+    # only add eventual prefix on first segment
+    if ($prefix && !@segment) {
+       @suggestion = map { $prefix . $_ } @suggestion;
+    }
+
     return @suggestion;
 }
 
+sub get_file_suggestions {
+    my ($path) = @_;
+
+    my $dir;
+    if ($path) {
+        (undef, $dir, undef) = splitpath($path);
+        $dir = '.' if !$dir;
+    } else {
+        $dir = '.';
+    }
+
+    my $dh;
+    return unless opendir ($dh, $dir);
+    my @files = readdir($dh);
+    closedir $dh;
+
+    @files = map { catfile $dir, $_ } @files if $dir ne '.';
+
+    return filter($path, @files);
+}
+
+sub get_directory_suggestions {
+    my ($path, $prefix) = @_;
+
+    my @suggestions = 
+        grep { -d $_} 
+        get_file_suggestions($path);
+
+    if ($prefix) {
+       @suggestions = map { $prefix . $_ } @suggestions;
+    }
+
+    return @suggestions;
+}
+
 sub get_functions {
 
     my $perlfunc;
@@ -89,30 +129,69 @@ sub filter {
     return grep { /$pattern/ } @list;
 }
 
-sub get_suggestions {
+sub get_perldoc_suggestions {
     my (@args) = @_;
-    my $word = pop @args;
+    my $cur = pop @args;
+    my $prev = pop @args;
 
-    if (@args) {
-        if ($args[-1] eq '-f') {
+    if ($prev) {
+        if ($prev eq '-f') {
             return filter(
-                $word,
+                $cur,
                 get_functions
             );
         }
     }
 
-    if ($word =~ /^-/) {
+    if ($cur =~ /^-/) {
         return filter(
-            $word,
+            $cur,
             qw/-h -D -t -u -m -l -F -i -v -V -T -r -d -o -M -w -n -X -L/
         );
 
     } else {
-        return get_package_suggestions($word);
+        return get_package_suggestions($cur);
+    }
+}
+
+sub get_perl_suggestions {
+    my (@args) = @_;
+    my $cur = pop @args;
+    my $prev = pop @args;
+    my $prefix;
+
+    if ($cur =~ /^(-\S)(\S*)/) {
+        $prev = $1;
+        $cur = $2;
+        $prefix = $prev;
+    }
+
+    if ($prev) {
+        if ($prev eq '-I' || $prev eq '-x') {
+            return get_directory_suggestions($cur, $prefix);
+        }
+        if ($prev eq '-m' || $prev eq '-M') {
+            return get_package_suggestions($cur, $prefix);
+        }
+    }
+
+    if ($cur =~ /^-/) {
+        return filter(
+            $cur,
+            qw/
+                -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
+            /
+        );
+    } else {
+        return get_file_suggestions($cur);
     }
 }
 
 my ($cmd, @args) = get_command_line();
 
-print "$_\n" for get_suggestions(@args);
+print "$_\n" for
+    $cmd eq 'perl'    ? get_perl_suggestions(@args)    :
+    $cmd eq 'perldoc' ? get_perldoc_suggestions(@args) :
+                        ()                             ;
+
diff --git a/completions/perl b/completions/perl
index dc71742c..61d09137 100644
--- a/completions/perl
+++ b/completions/perl
@@ -2,55 +2,9 @@
 
 have perl &&
 {
-_perlmodules()
-{
-    COMPREPLY=( $( compgen -P "$prefix" -W "$( perl -e 'sub mods { my ($base,$dir)=@_; return if  $base !~ /^\Q$ENV{cur}/; chdir($dir) or return; for (glob(q[*.pm])) {s/\.pm$//; print qq[$base$_\n]}; mods(/^(?:[.\d]+|$Config{archname}-$Config{osname}|auto)$/ ? undef : qq[${base}${_}::],qq[$dir/$_]) for grep {-d} glob(q[*]); } mods(undef,$_) for @INC;' )" -- "$cur" ) )
-    __ltrim_colon_completions "$1"
-}
+complete -C ${BASH_SOURCE[0]%/*}/helpers/perl -o nospace -o default perl
 
-_perl()
-{
-    local cur prev prefix temp
-    local optPrefix optSuffix
-
-    COMPREPLY=()
-    _get_comp_words_by_ref -n : cur prev
-    prefix=""
-
-    # If option not followed by whitespace, reassign prev and cur
-    if [[ "$cur" == -?* ]]; then
-        temp=$cur
-        prev=${temp:0:2}
-        cur=${temp:2}
-        optPrefix=-P$prev
-        optSuffix=-S/
-        prefix=$prev
-    fi
-
-    # only handle module completion for now
-    case $prev in
-        -I|-x)
-            local IFS=$'\n'
-            _compopt_o_filenames
-            COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
-            return 0
-            ;;
-        -m|-M)
-            _perlmodules "$cur"
-            return 0
-            ;;
-    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" ) )
-    else
-        _filedir
-    fi
-}
-complete -F _perl -o nospace perl
-
-complete -C ${BASH_SOURCE[0]%/*}/helpers/perldoc -o nospace -o default perldoc
+complete -C ${BASH_SOURCE[0]%/*}/helpers/perl -o nospace -o default perldoc
 }
 
 # Local variables:

From 4254f3a4a5b94d1de17d9c27d8552f19ea1483f9 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 7 Nov 2010 20:01:41 +0100
Subject: [PATCH 165/214] Switch back to a shell completion function for perl
 and perldoc completions, using an external helper just for functions and
 modules completions. This is overally slower, as our helper outputs all
 available modules at once, rather than just one piece of namespace, but this
 is more in line with other completions

---
 completions/helpers/perl | 201 ++++++++-------------------------------
 completions/perl         |  93 +++++++++++++++++-
 2 files changed, 133 insertions(+), 161 deletions(-)

diff --git a/completions/helpers/perl b/completions/helpers/perl
index a0468440..dc44d71f 100755
--- a/completions/helpers/perl
+++ b/completions/helpers/perl
@@ -1,103 +1,50 @@
 #!/usr/bin/env perl
 use strict;
-use File::Spec::Functions qw( rel2abs catdir catfile no_upwards splitpath );
+use Config;
+use File::Spec::Functions;
 
-sub uniq { my %seen; grep { not $seen{$_}++ } @_ }
+my %seen;
 
-sub get_command_line {
-    my $comp = substr $ENV{'COMP_LINE'}, 0, $ENV{'COMP_POINT'};
-    return split /[ \t]+/, $comp, -1; # if not good enough, use Text::ParseWords
-}
+sub print_modules_real {
+    my ($base, $dir, $word) = @_;
 
-sub slurp_dir {
-    opendir my $dir, shift or return;
-    no_upwards readdir $dir;
-}
+    # returns immediatly if the base doesn't match
+    return if $base && $base !~ /^\Q$word/;
 
-sub suggestion_from_name {
-    my ( $file_rx, $path, $name ) = @_;
-    return if not $name =~ /$file_rx/;
-    return $name.'::' if -d catdir $path, $name;
-    return $1;
-}
+    chdir($dir) or return;
 
-sub suggestions_from_path {
-    my ( $file_rx, $path ) = @_;
-    map { suggestion_from_name $file_rx, $path, $_ } slurp_dir $path;
-}
-
-sub get_package_suggestions {
-    my ( $pkg, $prefix ) = @_;
-
-    my @segment = split /::|:\z/, $pkg, -1;
-    my $file_rx = qr/\A(${\quotemeta pop @segment}\w*)(?:\.pm|\.pod)?\z/;
-
-    my $home = rel2abs $ENV{'HOME'};
-    my $cwd = rel2abs do { require Cwd; Cwd::cwd() };
-
-    my @suggestion =
-        map { suggestions_from_path $file_rx, $_ }
-        uniq map { catdir $_, @segment }
-        grep { $home ne $_ and $cwd ne $_ }
-        map { $_, ( catdir $_, 'pod' ) }
-        map { rel2abs $_ }
-        @INC;
-
-    # fixups
-    if ( $pkg eq '' ) {
-        my $total = @suggestion;
-        @suggestion = grep { not /^perl/ } @suggestion;
-        my $num_hidden = $total - @suggestion;
-        push @suggestion, "perl* ($num_hidden hidden)" if $num_hidden;
-    }
-    elsif ( $pkg =~ /(?<!:):\z/ ) {
-        @suggestion = map { ":$_" } @suggestion;
+    # print each file
+    foreach my $file (glob('*.pm')) {
+        $file =~ s/\.pm$//;
+        my $module = $base . $file;
+        next if $module !~ /^\Q$word/;
+        next if $seen{$module}++;
+        print $module . "\n";
     }
 
-    # only add eventual prefix on first segment
-    if ($prefix && !@segment) {
-       @suggestion = map { $prefix . $_ } @suggestion;
+    # recurse in each subdirectory
+    foreach my $directory (grep { -d } glob('*')) {
+        my $subdir = $dir . '/' . $directory;
+        if ($directory =~ /^(?:[.\d]+|$Config{archname}|auto)$/) {
+            # exclude subdirectory name from base
+            print_modules_real(undef, $subdir, $word);
+        } else {
+            # add subdirectory name to base
+            print_modules_real($base . $directory . '::', $subdir, $word);
+        }
     }
-
-    return @suggestion;
 }
 
-sub get_file_suggestions {
-    my ($path) = @_;
+sub print_modules {
+    my ($word) = @_;
 
-    my $dir;
-    if ($path) {
-        (undef, $dir, undef) = splitpath($path);
-        $dir = '.' if !$dir;
-    } else {
-        $dir = '.';
+    foreach my $directory (@INC) {
+        print_modules_real(undef, $directory, $word);
     }
-
-    my $dh;
-    return unless opendir ($dh, $dir);
-    my @files = readdir($dh);
-    closedir $dh;
-
-    @files = map { catfile $dir, $_ } @files if $dir ne '.';
-
-    return filter($path, @files);
 }
 
-sub get_directory_suggestions {
-    my ($path, $prefix) = @_;
-
-    my @suggestions = 
-        grep { -d $_} 
-        get_file_suggestions($path);
-
-    if ($prefix) {
-       @suggestions = map { $prefix . $_ } @suggestions;
-    }
-
-    return @suggestions;
-}
-
-sub get_functions {
+sub print_functions {
+    my ($word) = @_;
 
     my $perlfunc;
     for ( @INC, undef ) {
@@ -108,90 +55,26 @@ sub get_functions {
 
     open my $fh, '<', $perlfunc or return;
 
-    my @functions;
     my $nest_level = -1;
     while ( <$fh> ) {
         next if 1 .. /^=head2 Alphabetical Listing of Perl Functions$/;
         ++$nest_level if /^=over/;
         --$nest_level if /^=back/;
         next if $nest_level;
-        push @functions, /^=item (-?\w+)/;
+        next unless /^=item (-?\w+)/;
+        my $function = $1;
+        next if $function !~ /^\Q$word/;
+        next if $seen{$function}++;
+        print $function . "\n";
     }
 
-    return @functions;
 }
 
-sub filter {
-    my ($word, @list) = @_;
+my $type = shift;
+my $word = shift;
 
-    my $pattern = qr/\A${\quotemeta $word}/;
-
-    return grep { /$pattern/ } @list;
+if ($type eq 'functions') {
+    print_functions($word);
+} elsif ($type eq 'modules') {
+    print_modules($word);
 }
-
-sub get_perldoc_suggestions {
-    my (@args) = @_;
-    my $cur = pop @args;
-    my $prev = pop @args;
-
-    if ($prev) {
-        if ($prev eq '-f') {
-            return filter(
-                $cur,
-                get_functions
-            );
-        }
-    }
-
-    if ($cur =~ /^-/) {
-        return filter(
-            $cur,
-            qw/-h -D -t -u -m -l -F -i -v -V -T -r -d -o -M -w -n -X -L/
-        );
-
-    } else {
-        return get_package_suggestions($cur);
-    }
-}
-
-sub get_perl_suggestions {
-    my (@args) = @_;
-    my $cur = pop @args;
-    my $prev = pop @args;
-    my $prefix;
-
-    if ($cur =~ /^(-\S)(\S*)/) {
-        $prev = $1;
-        $cur = $2;
-        $prefix = $prev;
-    }
-
-    if ($prev) {
-        if ($prev eq '-I' || $prev eq '-x') {
-            return get_directory_suggestions($cur, $prefix);
-        }
-        if ($prev eq '-m' || $prev eq '-M') {
-            return get_package_suggestions($cur, $prefix);
-        }
-    }
-
-    if ($cur =~ /^-/) {
-        return filter(
-            $cur,
-            qw/
-                -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
-            /
-        );
-    } else {
-        return get_file_suggestions($cur);
-    }
-}
-
-my ($cmd, @args) = get_command_line();
-
-print "$_\n" for
-    $cmd eq 'perl'    ? get_perl_suggestions(@args)    :
-    $cmd eq 'perldoc' ? get_perldoc_suggestions(@args) :
-                        ()                             ;
-
diff --git a/completions/perl b/completions/perl
index 61d09137..1aa9d2f1 100644
--- a/completions/perl
+++ b/completions/perl
@@ -2,9 +2,98 @@
 
 have perl &&
 {
-complete -C ${BASH_SOURCE[0]%/*}/helpers/perl -o nospace -o default perl
+_perlmodules()
+{
+    COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
+    __ltrim_colon_completions "$1"
+}
 
-complete -C ${BASH_SOURCE[0]%/*}/helpers/perl -o nospace -o default perldoc
+_perlfunctions()
+{
+    COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl functions $cur )" -- "$cur" ) )
+}
+
+_perl()
+{
+    local cur prev prefix temp
+    local optPrefix optSuffix
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n : cur prev
+    prefix=""
+
+    # If option not followed by whitespace, reassign prev and cur
+    if [[ "$cur" == -?* ]]; then
+        temp=$cur
+        prev=${temp:0:2}
+        cur=${temp:2}
+        optPrefix=-P$prev
+        optSuffix=-S/
+        prefix=$prev
+    fi
+
+    # only handle module completion for now
+    case $prev in
+        -I|-x)
+            local IFS=$'\n'
+            _compopt_o_filenames
+            COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
+            return 0
+            ;;
+        -m|-M)
+            _perlmodules "$cur"
+            return 0
+            ;;
+    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" ) )
+    else
+        _filedir
+    fi
+}
+complete -F _perl -o nospace perl
+
+_perldoc()
+{
+    local cur prev prefix temp
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n : cur prev
+    prefix=""
+
+    # completing an option (may or may not be separated by a space)
+    if [[ "$cur" == -?* ]]; then
+        temp=$cur
+        prev=${temp:0:2}
+        cur=${temp:2}
+        prefix=$prev
+    fi
+
+    # complete builtin perl functions
+    case $prev in
+        -f)
+            _perlfunctions "$cur"
+             return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-h -v -t -u -m -l -F -X -f -q' -- "$cur" ))
+    else
+        # return available modules (unless it is clearly a file)
+        if [[ "$cur" != */* ]]; then
+            _perlmodules "$cur"
+            COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
+                '$( PAGER=/bin/cat man perl |  \
+                sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
+                awk "\$NF=2 { print \$1}" | command grep perl )' -- "$cur" ) )
+        fi
+        _filedir '@(pl|PL|pm|PM|pod|POD)'
+    fi
+}
+complete -F _perldoc -o bashdefault perldoc
 }
 
 # Local variables:

From 6a517905066612360854eb47a72ea3bc0c82a864 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 7 Nov 2010 20:17:28 +0100
Subject: [PATCH 166/214] test perldoc options completion

---
 test/lib/completions/perldoc.exp | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index 75858978..dc1c79c8 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -11,25 +11,6 @@ proc teardown {} {
 setup
 
 
-set test "perldoc should complete options"
-set cmd "perldoc -"
-send "$cmd\t"
-expect -ex "$cmd"
-# We can't anchor on $, simulate typing a magical string instead.
-set endguard "Magic End Guard"
-send "$endguard"
-expect {
-    # NOTE: Expected failure: After switching to pure perl perldoc completion,
-    #       the completion of options has disappeared.  See commit 07b7ddd1d
-    #       and Alioth #312800
-    -re "^$endguard$" { xfail "$test" }
-    -re "-h.*$endguard$" { pass "$test" }
-}
-
-
-sync_after_int
-
-
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"
@@ -45,6 +26,15 @@ expect {
 }
 
 
+sync_after_int
+
+set test "- should complete options"
+set options {
+    -h -v -t -u -m -l -F -X -f -q
+}
+assert_complete $options "perldoc -"
+
+
 sync_after_int
 
 

From 4162edf2c14c67e2798a435bdccf0d387203f044 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Sun, 7 Nov 2010 21:30:37 +0100
Subject: [PATCH 167/214] document COMP_IWLIST_SCAN variable

---
 doc/bash_completion.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/bash_completion.txt b/doc/bash_completion.txt
index b10d6746..8cd3de24 100644
--- a/doc/bash_completion.txt
+++ b/doc/bash_completion.txt
@@ -17,6 +17,9 @@ Environment variables
     remotely checked-out files.  This requires passwordless access to the
     remote repository.  Default is unset.
 
+*COMP_IWLIST_SCAN*::
+    If set and not null, `iwconfig` completion will try to complete on
+    available wireless networks identifiers.  Default is unset.
 
 *COMP_KNOWN_HOSTS_WITH_HOSTFILE*::
     If set and not null (default), known hosts completion will complement

From 8f0055553bc15bb4aa31e6a32e0572949cffb6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 12 Nov 2010 21:56:40 +0200
Subject: [PATCH 168/214] Add/improve various autotools completions.

---
 CHANGES                             |   1 +
 bash_completion                     |   2 +-
 completions/Makefile.am             |   2 +
 completions/autoconf                | 124 ++++++++++++++++++++++++++++
 completions/automake                |  80 ++++++++++++++++++
 test/completion/aclocal.exp         |   1 +
 test/completion/autoheader.exp      |   1 +
 test/completion/autoreconf.exp      |   1 +
 test/completion/autoscan.exp        |   1 +
 test/completion/autoupdate.exp      |   1 +
 test/lib/completions/aclocal.exp    |  20 +++++
 test/lib/completions/autoheader.exp |  20 +++++
 test/lib/completions/autoreconf.exp |  20 +++++
 test/lib/completions/autoscan.exp   |  20 +++++
 test/lib/completions/autoupdate.exp |  20 +++++
 15 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 completions/autoconf
 create mode 100644 completions/automake
 create mode 100644 test/completion/aclocal.exp
 create mode 100644 test/completion/autoheader.exp
 create mode 100644 test/completion/autoreconf.exp
 create mode 100644 test/completion/autoscan.exp
 create mode 100644 test/completion/autoupdate.exp
 create mode 100644 test/lib/completions/aclocal.exp
 create mode 100644 test/lib/completions/autoheader.exp
 create mode 100644 test/lib/completions/autoreconf.exp
 create mode 100644 test/lib/completions/autoscan.exp
 create mode 100644 test/lib/completions/autoupdate.exp

diff --git a/CHANGES b/CHANGES
index 47fdab5c..c53ae2ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -36,6 +36,7 @@ bash-completion (2.x)
   * Improve relevance of many user/group completions, depending on context.
   * Remove most "-o filenames" options to "complete", turn "-o filenames" on
     dynamically when needed instead.
+  * Add/improve various autotools completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 0e94b4d1..32472787 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1575,7 +1575,7 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-for i in a2ps autoconf automake awk bash bc bison cat colordiff cp csplit \
+for i in a2ps awk bash bc bison cat colordiff cp csplit \
     curl cut date df diff dir du enscript env expand fmt fold gperf gprof \
     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
     mv netstat nl nm objcopy objdump od paste patch pr ptx readelf rm rmdir \
diff --git a/completions/Makefile.am b/completions/Makefile.am
index ead561b3..2071564f 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -6,6 +6,8 @@ bashcomp_DATA = abook \
 		apt-build \
 		aptitude \
 		aspell \
+		autoconf \
+		automake \
 		autorpm \
 		bash-builtins \
 		bind-utils \
diff --git a/completions/autoconf b/completions/autoconf
new file mode 100644
index 00000000..c8f1b195
--- /dev/null
+++ b/completions/autoconf
@@ -0,0 +1,124 @@
+# Completions for autoconf tools
+
+have autoconf &&
+_autoconf()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|-h|--version|-V|--trace|-t)
+            return 0
+            ;;
+        --output|-o)
+            _filedir
+            return 0
+            ;;
+        --warnings|-W)
+            local cats=( cross obsolete syntax )
+            COMPREPLY=( $( compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur" ) )
+            return 0
+            ;;
+        --prepend-include|-B|--include|-I)
+            _filedir -d
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        _longopt $1
+        return
+    fi
+
+    _filedir '@(ac|in)'
+} &&
+complete -F _autoconf autoconf
+
+have autoreconf || have autoheader &&
+_autoreconf()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|-h|--version|-V)
+            return 0
+            ;;
+        --warnings|-W)
+            local cats=( cross gnu obsolete override portability syntax \
+                unsupported )
+            COMPREPLY=( $( compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur" ) )
+            return 0
+            ;;
+        --prepend-include|-B|--include|-I)
+            _filedir -d
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        _longopt $1
+        return 0
+    fi
+
+    if [[ $1 == autoheader ]] ; then
+        _filedir '@(ac|in)'
+    else
+        _filedir -d
+    fi
+} &&
+complete -F _autoreconf autoreconf autoheader
+
+have autoscan || have autoupdate &&
+_autoscan()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|-h|--version|-V)
+            return 0
+            ;;
+        --prepend-include|-B|--include|-I)
+            _filedir -d
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        _longopt $1
+        return 0
+    fi
+
+    if [[ $1 == autoupdate ]] ; then
+        _filedir '@(ac|in)'
+    else
+        _filedir -d
+    fi
+} &&
+complete -F _autoscan autoscan autoupdate
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/automake b/completions/automake
new file mode 100644
index 00000000..7ed87453
--- /dev/null
+++ b/completions/automake
@@ -0,0 +1,80 @@
+# Completions for automake tools
+
+have automake &&
+_automake()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|--version)
+            return 0
+            ;;
+        --warnings|-W)
+            local cats=( gnu obsolete override portability syntax unsupported )
+            COMPREPLY=( $( compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur" ) )
+            return 0
+            ;;
+        --libdir)
+            _filedir -d
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        _longopt $1
+        return
+    fi
+
+    _filedir
+} &&
+complete -F _automake automake automake-1.11
+
+have aclocal &&
+_aclocal()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|--print-ac-dir|--version)
+            return 0
+            ;;
+        --acdir|-I)
+            _filedir -d
+            return 0
+            ;;
+        --output)
+            _filedir
+            return 0
+            ;;
+        --warnings|-W)
+            local cats=( syntax unsupported )
+            COMPREPLY=( $( compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    _longopt $1
+} &&
+complete -F _aclocal aclocal aclocal-1.11
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/aclocal.exp b/test/completion/aclocal.exp
new file mode 100644
index 00000000..477921a9
--- /dev/null
+++ b/test/completion/aclocal.exp
@@ -0,0 +1 @@
+assert_source_completions aclocal
diff --git a/test/completion/autoheader.exp b/test/completion/autoheader.exp
new file mode 100644
index 00000000..b797371a
--- /dev/null
+++ b/test/completion/autoheader.exp
@@ -0,0 +1 @@
+assert_source_completions autoheader
diff --git a/test/completion/autoreconf.exp b/test/completion/autoreconf.exp
new file mode 100644
index 00000000..337d11f7
--- /dev/null
+++ b/test/completion/autoreconf.exp
@@ -0,0 +1 @@
+assert_source_completions autoreconf
diff --git a/test/completion/autoscan.exp b/test/completion/autoscan.exp
new file mode 100644
index 00000000..9fc76858
--- /dev/null
+++ b/test/completion/autoscan.exp
@@ -0,0 +1 @@
+assert_source_completions autoscan
diff --git a/test/completion/autoupdate.exp b/test/completion/autoupdate.exp
new file mode 100644
index 00000000..f56f4c6d
--- /dev/null
+++ b/test/completion/autoupdate.exp
@@ -0,0 +1 @@
+assert_source_completions autoupdate
diff --git a/test/lib/completions/aclocal.exp b/test/lib/completions/aclocal.exp
new file mode 100644
index 00000000..da133aa8
--- /dev/null
+++ b/test/lib/completions/aclocal.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "aclocal "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/autoheader.exp b/test/lib/completions/autoheader.exp
new file mode 100644
index 00000000..d85d4606
--- /dev/null
+++ b/test/lib/completions/autoheader.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "autoheader "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/autoreconf.exp b/test/lib/completions/autoreconf.exp
new file mode 100644
index 00000000..98808fb2
--- /dev/null
+++ b/test/lib/completions/autoreconf.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "autoreconf "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/autoscan.exp b/test/lib/completions/autoscan.exp
new file mode 100644
index 00000000..f75da812
--- /dev/null
+++ b/test/lib/completions/autoscan.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "autoscan "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/autoupdate.exp b/test/lib/completions/autoupdate.exp
new file mode 100644
index 00000000..c83912dd
--- /dev/null
+++ b/test/lib/completions/autoupdate.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "autoupdate "
+
+
+sync_after_int
+
+
+teardown

From c86b336769cdc025a63c13bf3448ce5d5019a563 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 12 Nov 2010 23:35:36 +0100
Subject: [PATCH 169/214] (testuite) Fix tests to run with autotools' make
 distcheck File locations are prefixed with `$::srcdir' so that `make
 distcheck' can execute the test suite using a relative path.

The current working directory is removed from the test-suite-bash-prompt.

Furthermore, no more dynamic creation of files in dir $::srcdir/fixtures since
this dir is read-only during `make distcheck'.  Instead create dynamic files in
$TESTDIR/tmp

The test suite uses these "directory" variables

   tcl            bash          description
   ------------   -----------   ------------------------------------
   $::srcdir      $SRCDIR       where `fixtures' reside, relative
   $::srcdirabs   $SRCDIRABS    where `fixtures' reside, absolute
   $::TESTDIR     $TESTDIR      where `runtest' is invoked, absolute
---
 configure.ac                           |  2 +-
 test/Makefile.am                       |  2 +
 test/completion/acroread.exp           |  2 +-
 test/completion/finger.exp             |  7 +--
 test/config/bashrc                     |  9 ++--
 test/fixtures/acroread/bar             |  0
 test/fixtures/acroread/t.pdf           |  0
 test/lib/completions/acroread.exp      |  6 +--
 test/lib/completions/cancel.exp        |  2 +-
 test/lib/completions/cd.exp            | 10 ++---
 test/lib/completions/evince.exp        |  2 +-
 test/lib/completions/find.exp          |  2 +-
 test/lib/completions/finger.exp        |  2 +-
 test/lib/completions/java.exp          |  4 +-
 test/lib/completions/kdvi.exp          |  2 +-
 test/lib/completions/kpdf.exp          |  2 +-
 test/lib/completions/lzma.exp          |  2 +-
 test/lib/completions/man.exp           |  6 +--
 test/lib/completions/mkdir.exp         |  2 +-
 test/lib/completions/mount.exp         |  5 +--
 test/lib/completions/mutt.exp          |  4 +-
 test/lib/completions/perl.exp          | 10 ++---
 test/lib/completions/pkg_deinstall.exp |  4 +-
 test/lib/completions/portinstall.exp   |  4 +-
 test/lib/completions/rmdir.exp         |  2 +-
 test/lib/completions/sbcl-mt.exp       |  2 +-
 test/lib/completions/sbcl.exp          |  2 +-
 test/lib/completions/scp.exp           | 15 +++----
 test/lib/completions/screen.exp        |  2 +-
 test/lib/completions/sftp.exp          | 16 +++----
 test/lib/completions/ssh.exp           | 20 ++++-----
 test/lib/completions/sudo.exp          |  6 +--
 test/lib/completions/xz.exp            |  6 +--
 test/lib/library.exp                   | 13 +++---
 test/unit/_filedir.exp                 | 62 +++++++++++++-------------
 test/unit/_known_hosts_real.exp        |  6 ++-
 test/unit/compgen.exp                  | 11 +++--
 37 files changed, 123 insertions(+), 131 deletions(-)
 create mode 100644 test/fixtures/acroread/bar
 create mode 100644 test/fixtures/acroread/t.pdf

diff --git a/configure.ac b/configure.ac
index b444e7a8..5e3265e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
-AM_INIT_AUTOMAKE([foreign dejagnu dist-bzip2 no-dist-gzip -Wall -Werror])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
 AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
 AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
 AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
diff --git a/test/Makefile.am b/test/Makefile.am
index 9dab2190..82f6df90 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,3 +12,5 @@ all:
 
 distclean-local:
 	rm -rf log tmp
+
+AUTOMAKE_OPTIONS = dejagnu
diff --git a/test/completion/acroread.exp b/test/completion/acroread.exp
index ccf00537..6ee03d6e 100644
--- a/test/completion/acroread.exp
+++ b/test/completion/acroread.exp
@@ -9,4 +9,4 @@ expect {
 }; # expect
 
 
-source "lib/completions/acroread.exp"
+source "$::srcdir/lib/completions/acroread.exp"
diff --git a/test/completion/finger.exp b/test/completion/finger.exp
index cc77abe5..7c7b8a26 100644
--- a/test/completion/finger.exp
+++ b/test/completion/finger.exp
@@ -1,6 +1 @@
-source "lib/completions/finger.exp"
-
-# TODO: Dynamic loading of completions.  After the tests have run a first time
-#       and real completion is installed, the tests can be run a second time.
-#
-# source "lib/completions/finger.exp"
+assert_source_completions finger
diff --git a/test/config/bashrc b/test/config/bashrc
index ddf06339..fd72b816 100644
--- a/test/config/bashrc
+++ b/test/config/bashrc
@@ -7,13 +7,12 @@ set -o posix
 	# Unset `command_not_found_handle' as defined on Debian/Ubuntu, because this 
 	# troubles and slows down testing
 unset -f command_not_found_handle
-	# Set prompt to ignore current root directory; display path starting
-	# from here.  E.g. prompt: /fixtures/@
+	# Set fixed prompt `/@'
 TESTDIR=$(pwd)
-export PS1='$(wd=$(pwd); echo ${wd#$TESTDIR}/)@'
+export PS1='/@'
 export PS2='> '
 	# Configure readline
-export INPUTRC=$TESTDIR/config/inputrc
+export INPUTRC=$SRCDIR/config/inputrc
     # When not running via cron, avoid escape junk at beginning of line from
     # readline, see e.g.  http://bugs.gentoo.org/246091
 [ "$CRON" ] || export TERM=dummy
@@ -31,7 +30,7 @@ unset -v \
     COMP_TAR_INTERNAL_PATHS
 
 	# Load bash testsuite helper functions
-. lib/library.sh
+. $SRCDIR/lib/library.sh
 
 # Local variables:
 # mode: shell-script
diff --git a/test/fixtures/acroread/bar b/test/fixtures/acroread/bar
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixtures/acroread/t.pdf b/test/fixtures/acroread/t.pdf
new file mode 100644
index 00000000..e69de29b
diff --git a/test/lib/completions/acroread.exp b/test/lib/completions/acroread.exp
index f1754e98..f627d34e 100644
--- a/test/lib/completions/acroread.exp
+++ b/test/lib/completions/acroread.exp
@@ -1,19 +1,17 @@
 proc setup {} {
     save_env
-    assert_bash_exec "touch fixtures/shared/default/t.pdf";  # Create temporary files
 }
 
 
 proc teardown {} {
-    assert_bash_exec "rm fixtures/shared/default/t.pdf";  # Remove temporary files
-    assert_env_unmodified
+    assert_env_unmodified {/OLDPWD/d}
 }
 
 
 setup
 
 
-assert_complete {"bar bar.d/" foo.d/ t.pdf} "acroread fixtures/shared/default/"
+assert_complete_dir {foo.d/ t.pdf} "acroread " $::srcdir/fixtures/acroread
 
 
 sync_after_int
diff --git a/test/lib/completions/cancel.exp b/test/lib/completions/cancel.exp
index fc2600ba..f4a03473 100644
--- a/test/lib/completions/cancel.exp
+++ b/test/lib/completions/cancel.exp
@@ -12,7 +12,7 @@ setup
 
 
     # Adding a print job is successful?
-if {[assert_exec {lp -H hold fixtures/shared/default/foo} job "" "untested"]} {
+if {[assert_exec {lp -H hold $::srcdir/fixtures/shared/default/foo} job "" "untested"]} {
     # Yes, adding a print-job is successful;
         # Retrieve job-id, so we can cancel the job after the test
     set job_id [lindex [split $job] 3]
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 6616cd82..c32e11c1 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -12,7 +12,7 @@ setup
 
 
 set test "Tab should complete"
-assert_complete {"bar bar.d/" foo.d/} "cd fixtures/shared/default/" $test
+assert_complete {"bar bar.d/" foo.d/} "cd $::srcdir/fixtures/shared/default/" $test
 
 
 sync_after_int
@@ -20,13 +20,13 @@ sync_after_int
 
 set test "Tab should complete cd at cursor position"
     # Try completion
-set cmd "cd fixtures/shared/default/foo"
+set cmd "cd $::srcdir/fixtures/shared/default/foo"
 append cmd \002\002\002; # \002 = ^B = Move cursor left in bash emacs mode
 #append cmd \033\0133D; # Escape-[-D = Cursor left
 send "$cmd\t"
 expect {
-    -re "cd fixtures/shared/default/foo\b\b\b\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@cd fixtures/shared/default/foo\b\b\b$" { pass "$test" }
-	-re "^cd fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
+    -re "cd $::srcdir/fixtures/shared/default/foo\b\b\b\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@cd $::srcdir/fixtures/shared/default/foo\b\b\b$" { pass "$test" }
+	-re "^cd $::srcdir/fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
 }
@@ -39,7 +39,7 @@ set test "Tab should complete CDPATH"
     # Set CDPATH
 assert_bash_exec "declare -p CDPATH &>/dev/null && OLDCDPATH=\$CDPATH || :"
 assert_bash_exec "CDPATH=\$PWD";
-assert_complete "fixtures/shared/default/foo.d/" "cd fixtures/shared/default/fo" $test
+assert_complete "$::srcdir/fixtures/shared/default/foo.d/" "cd $::srcdir/fixtures/shared/default/fo" $test
 sync_after_int
     # Reset CDPATH
 assert_bash_exec "declare -p OLDCDPATH &>/dev/null && CDPATH=\$OLDCDPATH || unset CDPATH && unset OLDCDPATH"
diff --git a/test/lib/completions/evince.exp b/test/lib/completions/evince.exp
index 607c4428..204467a1 100644
--- a/test/lib/completions/evince.exp
+++ b/test/lib/completions/evince.exp
@@ -26,7 +26,7 @@ set files {
     .tga .TGA .tif .TIF .tiff .TIFF
     .xpm .XPM .xwd .XWD
 }
-assert_complete_dir $files "evince " "fixtures/evince"
+assert_complete_dir $files "evince " "$::srcdir/fixtures/evince"
 
 
 sync_after_int 
diff --git a/test/lib/completions/find.exp b/test/lib/completions/find.exp
index aab08225..9acda648 100644
--- a/test/lib/completions/find.exp
+++ b/test/lib/completions/find.exp
@@ -41,7 +41,7 @@ sync_after_int
 
 
 set test "-wholename should complete files/dirs"
-set dir fixtures/shared/default
+set dir $::srcdir/fixtures/shared/default
 set files [split [exec bash -c "cd $dir && ls -p"] "\n"]
 assert_complete_dir $files "find -wholename " $dir
 
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index ae86a2d9..f139c962 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -39,7 +39,7 @@ set hosts {}
 set char ""
 foreach h [get_known_hosts] {
     set first [string range $h 0 0]
-    if {$char == "" && [string first $first $COMP_WORDBREAKS] == -1} {set char $first}
+    if {$char == "" && [string first $first $::COMP_WORDBREAKS] == -1} {set char $first}
     if {$char != ""} {
         # Only append unique hostnames starting with $char
         if {$first == $char && [lsearch -exact $hosts "test@$h"] == -1} {
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 16b60054..8864baf2 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -25,7 +25,7 @@ sync_after_int
 
 
 assert_complete "bashcomp.jarred toplevel" \
-    "java -cp fixtures/java/bashcomp.jar "
+    "java -cp $::srcdir/fixtures/java/bashcomp.jar "
 
 
 sync_after_int
@@ -37,7 +37,7 @@ assert_no_complete "java -cp \"\" "
 sync_after_int
 
 
-assert_complete "a/ bashcomp.jar" "java -jar fixtures/java/"
+assert_complete "a/ bashcomp.jar" "java -jar $::srcdir/fixtures/java/"
 
 
 sync_after_int
diff --git a/test/lib/completions/kdvi.exp b/test/lib/completions/kdvi.exp
index c7881da1..fa993f5e 100644
--- a/test/lib/completions/kdvi.exp
+++ b/test/lib/completions/kdvi.exp
@@ -18,7 +18,7 @@ set files {
     foo/
     .dvi  .DVI  .dvi.bz2  .DVI.bz2  .dvi.gz  .DVI.gz  .dvi.Z  .DVI.Z
 }
-assert_complete_dir $files "kdvi " "fixtures/kdvi"
+assert_complete_dir $files "kdvi " "$::srcdir/fixtures/kdvi"
 
 
 sync_after_int
diff --git a/test/lib/completions/kpdf.exp b/test/lib/completions/kpdf.exp
index 4066c9c6..6f0feb68 100644
--- a/test/lib/completions/kpdf.exp
+++ b/test/lib/completions/kpdf.exp
@@ -17,7 +17,7 @@ setup
 set files {
     foo/ .eps .ps .EPS .PS .pdf .PDF
 }
-assert_complete_dir $files "kpdf " "fixtures/kpdf"
+assert_complete_dir $files "kpdf " "$::srcdir/fixtures/kpdf"
 
 
 sync_after_int 
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
index 56364d13..ba57d10b 100644
--- a/test/lib/completions/lzma.exp
+++ b/test/lib/completions/lzma.exp
@@ -17,7 +17,7 @@ assert_complete_any "lzma "
 sync_after_int
 
 
-assert_complete "a/ bashcomp.lzma bashcomp.tlz" "lzma -d fixtures/xz/"
+assert_complete "a/ bashcomp.lzma bashcomp.tlz" "lzma -d $::srcdir/fixtures/xz/"
 
 
 sync_after_int
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index e0056ca2..c7358c62 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -1,11 +1,11 @@
 proc setup {} {
-    assert_bash_exec {export MANPATH=$TESTDIR/fixtures/man}
+    assert_bash_exec "export MANPATH=$::srcdirabs/fixtures/man"
     save_env
 }
 
 
 proc teardown {} {
-    assert_env_unmodified
+    assert_env_unmodified {/OLDPWD/d}
 }
 
 
@@ -18,7 +18,7 @@ assert_complete "bar" "man b"
 sync_after_int
 
 
-assert_complete "fixtures/man/man1/foo.1" "man fixtures/man/man1/f"
+assert_complete_dir oo.1 "man man1/f" $::srcdir/fixtures/man
 
 
 sync_after_int
diff --git a/test/lib/completions/mkdir.exp b/test/lib/completions/mkdir.exp
index 4fc7b800..8d8c881d 100644
--- a/test/lib/completions/mkdir.exp
+++ b/test/lib/completions/mkdir.exp
@@ -17,7 +17,7 @@ assert_complete_any "mkdir "
 sync_after_int
 
 
-assert_complete {"bar bar.d/" foo.d/} "mkdir fixtures/shared/default/"
+assert_complete {"bar bar.d/" foo.d/} "mkdir $::srcdir/fixtures/shared/default/"
 
 
 sync_after_int
diff --git a/test/lib/completions/mount.exp b/test/lib/completions/mount.exp
index 38d93e3b..bab720b0 100644
--- a/test/lib/completions/mount.exp
+++ b/test/lib/completions/mount.exp
@@ -5,11 +5,10 @@ proc setup_dummy_mnt {} {
     assert_bash_exec {unset COMPREPLY cur}
     assert_bash_exec {unset -f _mnt}
 
-    global TESTDIR
     assert_bash_exec { \
         _mnt() { \
             local cur=$(_get_cword); \
-            _linux_fstab $(_get_pword) < "$TESTDIR/fixtures/mount/test-fstab"; \
+            _linux_fstab $(_get_pword) < "$SRCDIRABS/fixtures/mount/test-fstab"; \
         }; \
         complete -F _mnt mnt \
     }
@@ -53,7 +52,7 @@ sync_after_int
 set test "Check completing nfs mounts"
 set expected [list /test/path /test/path2 /second/path]
 set cmd "mount mocksrv:/"
-assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/mount/bin:$PATH";}
+assert_bash_exec {OLDPATH="$PATH"; PATH="$SRCDIRABS/fixtures/mount/bin:$PATH";}
 # This needs an explicit cword param or will output "unresolved".
 assert_complete $expected $cmd $test "/@" 20 "/"
 sync_after_int
diff --git a/test/lib/completions/mutt.exp b/test/lib/completions/mutt.exp
index 91eb2457..8cb8b0c6 100644
--- a/test/lib/completions/mutt.exp
+++ b/test/lib/completions/mutt.exp
@@ -19,12 +19,12 @@ sync_after_int
 
 set test "mutt should complete mailboxes" 
 set expected {foo/ bar/ muttrc}
-assert_complete_dir $expected "mutt -F muttrc -f =" fixtures/mutt
+assert_complete_dir $expected "mutt -F muttrc -f =" $::srcdir/fixtures/mutt
 
 
 set test "mutt should complete aliases" 
 set expected {a1 a2}
-assert_complete_dir $expected "mutt -F muttrc -A " fixtures/mutt
+assert_complete_dir $expected "mutt -F muttrc -A " $::srcdir/fixtures/mutt
 
 
 sync_after_int
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index e02bd454..8be41621 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -18,7 +18,7 @@ sync_after_int
 
 
 set test "Second argument should file complete"
-set cmd "perl foo fixtures/shared/default/f"
+set cmd "perl foo $::srcdir/fixtures/shared/default/f"
 send "$cmd\t"
 expect {
     -re "^$cmd\r\nfoo +foo.d/ *\r\n/@${cmd}oo$" { pass "$test" }
@@ -31,7 +31,7 @@ sync_after_int
 
 
 set test "-I without space should complete directories"
-set cmd "perl -Ifixtures/shared/default/"
+set cmd "perl -I$::srcdir/fixtures/shared/default/"
 send "$cmd\t"
 expect {
     -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
@@ -44,7 +44,7 @@ sync_after_int
 
 
 set test "-I with space should complete directories"
-set cmd "perl -I fixtures/shared/default/"
+set cmd "perl -I $::srcdir/fixtures/shared/default/"
 send "$cmd\t"
 expect {
     -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
@@ -57,7 +57,7 @@ sync_after_int
 
 
 set test "-x without space should complete directories"
-set cmd "perl -xfixtures/shared/default/b"
+set cmd "perl -x$::srcdir/fixtures/shared/default/b"
 send "$cmd\t"
 expect {
     -re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" }
@@ -70,7 +70,7 @@ sync_after_int
 
 
 set test "-x with space should complete directories"
-set cmd "perl -x fixtures/shared/default/b"
+set cmd "perl -x $::srcdir/fixtures/shared/default/b"
 send "$cmd\t"
 expect {
     -re "^${cmd}ar\\\\ bar.d/ *$" { pass "$test" }
diff --git a/test/lib/completions/pkg_deinstall.exp b/test/lib/completions/pkg_deinstall.exp
index e61d0ce3..c2b3ae0b 100644
--- a/test/lib/completions/pkg_deinstall.exp
+++ b/test/lib/completions/pkg_deinstall.exp
@@ -1,5 +1,5 @@
 proc setup {} {
-    assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
+    assert_bash_exec {PKG_DBDIR=$::srcdir/fixtures/pkgtools/db}
     save_env
 }
 
@@ -12,7 +12,7 @@ proc teardown {} {
 setup
 
 
-set pkgs [exec bash -c "cd fixtures/pkgtools/db ; compgen -d"]
+set pkgs [exec bash -c "cd $::srcdir/fixtures/pkgtools/db ; compgen -d"]
 assert_complete $pkgs "pkg_deinstall "
 
 
diff --git a/test/lib/completions/portinstall.exp b/test/lib/completions/portinstall.exp
index 9f44e96b..ab14afa8 100644
--- a/test/lib/completions/portinstall.exp
+++ b/test/lib/completions/portinstall.exp
@@ -1,11 +1,11 @@
 proc setup {} {
-    assert_bash_exec {PORTSDIR=fixtures/pkgtools/ports ; sed -e s,PORTSDIR,$PORTSDIR,g $PORTSDIR/INDEX.dist > $PORTSDIR/INDEX ; cp $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
+    assert_bash_exec {PORTSDIR=$TESTDIR/tmp; sed -e s,PORTSDIR,$PORTSDIR,g $::srcdir/fixtures/pkgtools/ports/INDEX.dist > $PORTSDIR/INDEX; cp $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
     save_env
 }
 
 
 proc teardown {} {
-    assert_bash_exec {rm fixtures/pkgtools/ports/INDEX fixtures/pkgtools/ports/INDEX-5}
+    assert_bash_exec {rm $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
     assert_env_unmodified
 }
 
diff --git a/test/lib/completions/rmdir.exp b/test/lib/completions/rmdir.exp
index 6452b4bb..1a904b64 100644
--- a/test/lib/completions/rmdir.exp
+++ b/test/lib/completions/rmdir.exp
@@ -17,7 +17,7 @@ assert_complete_any "rmdir "
 sync_after_int
 
 
-assert_complete {"bar bar.d/" foo.d/} "rmdir fixtures/shared/default/"
+assert_complete {"bar bar.d/" foo.d/} "rmdir $::srcdir/fixtures/shared/default/"
 
 
 sync_after_int
diff --git a/test/lib/completions/sbcl-mt.exp b/test/lib/completions/sbcl-mt.exp
index d328fec3..a80e543b 100644
--- a/test/lib/completions/sbcl-mt.exp
+++ b/test/lib/completions/sbcl-mt.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl-mt fixtures/shared/default/"
+assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl-mt $::srcdir/fixtures/shared/default/"
 
 
 sync_after_int
diff --git a/test/lib/completions/sbcl.exp b/test/lib/completions/sbcl.exp
index c6f908f6..3adeb6bf 100644
--- a/test/lib/completions/sbcl.exp
+++ b/test/lib/completions/sbcl.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl fixtures/shared/default/"
+assert_complete {bar "bar bar.d/" foo foo.d/} "sbcl $::srcdir/fixtures/shared/default/"
 
 
 sync_after_int
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index 57c41b80..e6cbf8e3 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -1,9 +1,13 @@
 proc setup {} {
     save_env
+    # NOTE: Changing dir to $SRCDIR is necessary because file locations in the
+    #       ssh config files (e.g. UserKnownHostsFile) are relative to $SRCDIR.
+    assert_bash_exec {cd $SRCDIR/fixtures/scp}
 }
 
 
 proc teardown {} {
+    assert_bash_exec {cd $TESTDIR}
     assert_env_unmodified {
         /BASH_LINENO=/d
         /BASH_SOURCE=/d
@@ -60,8 +64,7 @@ foreach host [get_hosts] {
 lappend expected blah: doo: gee: hus: ike:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
-set dir fixtures/scp
-assert_complete_dir $expected "scp -F config " $dir
+assert_complete $expected "scp -F config "
 
 
 sync_after_int
@@ -94,16 +97,12 @@ foreach host [get_hosts] {
 lappend expected blah: doo: gee: hus: ike: jar:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
-set dir fixtures/scp
-#assert_complete_dir $expected "scp -F 'spaced  conf' " $dir
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
 set cmd "scp -F 'spaced  conf' "
 send "$cmd\t"
 expect -ex "$cmd\r\n"
 if {[match_items [lsort -unique $expected] -bash-sort]} {
     expect {
-        -re $prompt { pass "$test" }
+        -re /@ { pass "$test" }
         -re eof { unresolved "eof" }
     }
 } else {
@@ -111,7 +110,7 @@ if {[match_items [lsort -unique $expected] -bash-sort]} {
     # http://www.mail-archive.com/bug-bash@gnu.org/msg06095.html
     if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"}
 }
-sync_after_int $prompt
+sync_after_int
 assert_bash_exec {cd "$TESTDIR"}
 
 
diff --git a/test/lib/completions/screen.exp b/test/lib/completions/screen.exp
index b8145894..e5bc4c15 100644
--- a/test/lib/completions/screen.exp
+++ b/test/lib/completions/screen.exp
@@ -18,7 +18,7 @@ sync_after_int
 
 
 assert_complete {bar "bar bar.d/" foo foo.d/} \
-    "screen -c fixtures/shared/default/" "-c should complete files/dirs"
+    "screen -c $::srcdir/fixtures/shared/default/" "-c should complete files/dirs"
 
 
 sync_after_int
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index fecdaf12..27fe7511 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -1,9 +1,13 @@
 proc setup {} {
     save_env
+    # NOTE: Changing dir to $SRCDIR is necessary because file locations in the
+    #       ssh config files (e.g. UserKnownHostsFile) are relative to $SRCDIR.
+    assert_bash_exec {cd $SRCDIR/fixtures/sftp}
 }
 
 
 proc teardown {} {
+    assert_bash_exec {cd $TESTDIR}
     assert_env_unmodified {
         /BASH_LINENO=/d
         /BASH_SOURCE=/d
@@ -20,8 +24,7 @@ set expected [get_hosts]
     # Hosts `gee' and `hus' are defined in ./fixtures/sftp/config
     # Hosts `10.10.10.10', `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
 lappend expected 10.10.10.10 doo gee hus ike
-set dir fixtures/sftp
-assert_complete_dir $expected "sftp -F config " $dir
+assert_complete $expected "sftp -F config "
 
 
 sync_after_int
@@ -48,19 +51,14 @@ set expected [get_hosts]
     # Hosts `gee', `hus' and `jar' are defined in "./fixtures/sftp/spaced  conf"
     # Hosts `10.10.10.10', `doo' and `ike' are defined in ./fixtures/sftp/known_hosts
 lappend expected 10.10.10.10 doo gee hus ike jar
-set dir fixtures/sftp
-assert_complete_dir $expected "sftp -F spaced\\ \\ conf " $dir
+assert_complete $expected "sftp -F spaced\\ \\ conf "
 
 
 sync_after_int
 
 
-set dir fixtures/sftp
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
 assert_complete "-Fspaced\\ \\ conf" "sftp -Fsp" "-F should complete filename"
-sync_after_int $prompt
-assert_bash_exec {cd "$TESTDIR"}
+sync_after_int
 
 
 teardown
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index a5a16994..d16b5f98 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -1,9 +1,13 @@
 proc setup {} {
     save_env
+    # NOTE: Changing dir to $SRCDIR is necessary because file locations in the
+    #       ssh config files (e.g. UserKnownHostsFile) are relative to $SRCDIR.
+    assert_bash_exec {cd $SRCDIR/fixtures/ssh}
 }
 
 
 proc teardown {} {
+    assert_bash_exec {cd $TESTDIR}
     assert_env_unmodified {
         /BASH_LINENO=/d
         /BASH_SOURCE=/d
@@ -17,19 +21,15 @@ setup
 
 set test "Tab should complete both commands and hostname"
     # Try completion
-set dir fixtures/ssh
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
 set cmd "ssh -F config ls"
 send "$cmd\t"
-set expected "^$cmd\r\n.*ls.*ls_known_host.*\r\n$prompt$cmd$"
+set expected "^$cmd\r\n.*ls.*ls_known_host.*\r\n/@$cmd$"
 expect {
     -re $expected  { pass "$test" }
-    -re $prompt { unresolved "$test at prompt" }
+    -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
 }
-sync_after_int $prompt
-assert_bash_exec {cd "$TESTDIR"}
+sync_after_int
 
 
 sync_after_int
@@ -69,12 +69,8 @@ sync_after_int
 
 
 set test "-F should complete filename"
-set dir fixtures/ssh
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
 assert_complete "-Fspaced\\ \\ conf" "ssh -Fsp" "-F should complete filename"
-sync_after_int $prompt
-assert_bash_exec {cd "$TESTDIR"}
+sync_after_int
 
 
 teardown
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index 1afd9933..a4b7690a 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -4,20 +4,20 @@ proc setup {} {
 
 
 proc teardown {} {
-    assert_env_unmodified
+    assert_env_unmodified {/OLDPWD/d}
 }
 
 
 setup
 
 
-assert_complete "fixtures/shared/default/foo.d/" "sudo cd fixtures/shared/default/fo"
+assert_complete_dir foo.d/ "sudo cd fo" $::srcdir/fixtures/shared/default
 
 
 sync_after_int
 
 
-assert_complete "fixtures/" "sudo sh fix"
+assert_complete_dir fixtures/ "sudo sh fix" $::srcdir
 
 
 sync_after_int
diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
index 83b1f350..4bc783a9 100644
--- a/test/lib/completions/xz.exp
+++ b/test/lib/completions/xz.exp
@@ -17,14 +17,14 @@ assert_complete_any "xz "
 sync_after_int
 
 
-assert_complete "a/ bashcomp.lzma bashcomp.tar.xz bashcomp.tlz bashcomp.xz" \
-    "xz -d fixtures/xz/"
+assert_complete_dir "a/ bashcomp.lzma bashcomp.tar.xz bashcomp.tlz bashcomp.xz" \
+    "xz -d " $::srcdir/fixtures/xz
 
 
 sync_after_int
 
 
-assert_complete "a/ bashcomp.tar" "xz fixtures/xz/"
+assert_complete_dir "a/ bashcomp.tar" "xz " $::srcdir/fixtures/xz
 
 
 sync_after_int
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c69aa2bb..92aef075 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -295,7 +295,7 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
 # @param string $cword  (optional) Last word of $cmd to complete.  See: assert_complete()
 # @result boolean  True if successful, False if not
 proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
-    set prompt "/$dir/@"
+    set prompt "/@"
     assert_bash_exec "cd $dir" "" $prompt
     assert_complete $expected $cmd $test $prompt $size $cword
     sync_after_int $prompt
@@ -510,7 +510,7 @@ proc assert_no_output {{cmd} {test ""} {prompt /@}} {
 proc assert_source_completions {command {file ""}} {
     if {[is_bash_completion_installed_for $command]} {
         if {[string length $file] == 0} {
-            set file "lib/completions/$command.exp"
+            set file "$::srcdir/lib/completions/$command.exp"
         }
         source $file
     } else {
@@ -738,9 +738,9 @@ proc _save_env {{file ""}} {
 
 # Source bash_completion package
 proc source_bash_completion {} {
-    assert_bash_exec {BASH_COMPLETION_DIR=$(cd "$TESTDIR/.."; pwd)/completions}
+    assert_bash_exec {BASH_COMPLETION_DIR=$(cd "$SRCDIR/.."; pwd)/completions}
     assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
-    assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
+    assert_bash_exec {BASH_COMPLETION=$(cd "$SRCDIR/.."; pwd)/bash_completion}
     assert_bash_exec {source "$BASH_COMPLETION"}
 }
 
@@ -854,10 +854,13 @@ proc find_unique_completion_pair {{list} {partName} {fullName}} {
 
 # Start bash running as test environment.
 proc start_bash {} {
-    global TESTDIR TOOL_EXECUTABLE spawn_id
+    global TESTDIR TOOL_EXECUTABLE spawn_id env srcdirabs
     set TESTDIR [pwd]
+    set srcdirabs [file normalize $::srcdir];  # Absolute srcdir
     # If `--tool_exec' option not specified, use "bash"
     if {! [info exists TOOL_EXECUTABLE]} {set TOOL_EXECUTABLE bash}
+    set env(SRCDIR) $::srcdir
+    set env(SRCDIRABS) $::srcdirabs
     exp_spawn $TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc
     assert_bash_exec {} "$TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc"
     # Bash < 3.2.41 has a bug where 'history' disappears from SHELLOPTS
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index 59b536e6..7c8c4205 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -20,17 +20,17 @@ proc setup {} {
     # directories containing `*' or `\' aren't allowed on Cygwin/Windows
     if {! [is_cygwin]} {
         # Create directory `a*b'
-        assert_bash_exec {(cd fixtures/_filedir && [ ! -d a\*b ] && mkdir a\*b && touch a\*b/j || true)}
+        assert_bash_exec {(cd $TESTDIR/tmp && [ ! -d a\*b ] && mkdir a\*b && touch a\*b/j || true)}
         # Create directory `a\b'
-        assert_bash_exec {(cd fixtures/_filedir && [ ! -d a\\b ] && mkdir a\\b && touch a\\b/g || true)}
+        assert_bash_exec {(cd $TESTDIR/tmp && [ ! -d a\\b ] && mkdir a\\b && touch a\\b/g || true)}
     }
 }
 
 
 proc teardown {} {
     if {! [is_cygwin]} {
-        assert_bash_exec {(cd fixtures/_filedir && rm -- a\\b/g && rmdir a\\b/ || true)}
-        assert_bash_exec {(cd fixtures/_filedir && rm -- a\*b/j && rmdir a\*b/ || true)}
+        assert_bash_exec {(cd $TESTDIR/tmp && rm -- a\\b/g && rmdir a\\b/ || true)}
+        assert_bash_exec {(cd $TESTDIR/tmp && rm -- a\*b/j && rmdir a\*b/ || true)}
     }
     assert_bash_exec {unset COMPREPLY cur}
     assert_bash_exec {unset -f _f _g}
@@ -56,7 +56,7 @@ foreach name {f f2} {
 
     set test "completing $name ab/ should return e"
     set cmd "$name ab/"
-    assert_complete_dir e $cmd "fixtures/_filedir" $test
+    assert_complete_dir e $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -64,7 +64,7 @@ foreach name {f f2} {
 
     set test "completing $name a\\ b/ should return i"
     set cmd "$name a\\ b/"
-    assert_complete_dir i $cmd "fixtures/_filedir" $test
+    assert_complete_dir i $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -72,7 +72,7 @@ foreach name {f f2} {
 
     set test "completing $name a\\\'b/ should return c"
     set cmd "$name a\\\'b/"
-    assert_complete_dir c $cmd "fixtures/_filedir" $test
+    assert_complete_dir c $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -80,7 +80,7 @@ foreach name {f f2} {
 
     set test "completing $name a\\\"b/ should return d"; #"
     set cmd "$name a\\\"b/"; #"
-    assert_complete_dir d $cmd "fixtures/_filedir" $test
+    assert_complete_dir d $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -88,8 +88,8 @@ foreach name {f f2} {
 
     set test "completing $name a\\\$b/ should return h"
     set cmd "$name a\\\$b/"
-    assert_complete_dir "\b\b\b\b\b$::TESTDIR/fixtures/_filedir/a\\\\\$b/h" \
-        $cmd "fixtures/_filedir" $test
+    assert_complete_dir "\b\b\b\b\b$::srcdirabs/fixtures/_filedir/a\\\\\$b/h" \
+        $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -101,7 +101,7 @@ foreach name {f f2} {
     if {! [is_cygwin]} {
         set test "completing $name a\\\\b/ should return g"
         set cmd "$name a\\\\b/"
-        assert_complete_dir g $cmd "fixtures/_filedir" $test
+        assert_complete_dir g $cmd "$TESTDIR/tmp" $test
 
 
         sync_after_int
@@ -110,7 +110,7 @@ foreach name {f f2} {
 
     set test "completing $name a\\&b/ should return f"
     set cmd "$name a\\&b/"
-    assert_complete_dir f $cmd "fixtures/_filedir" $test
+    assert_complete_dir f $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -118,7 +118,7 @@ foreach name {f f2} {
 
     set test "completing $name a\$ should return a\\\$b/"
     set cmd "$name a\$"
-    assert_complete_dir "\b\\\\\$b/" $cmd "fixtures/_filedir" $test
+    assert_complete_dir "\b\\\\\$b/" $cmd "$::srcdir/fixtures/_filedir" $test
 
 
     sync_after_int
@@ -132,21 +132,21 @@ foreach name {f f2} {
         [lindex $::BASH_VERSINFO 2] < 35
     )} {
         set cmd "$name 'ab/"
-        assert_complete_dir {e'} $cmd "fixtures/_filedir"
+        assert_complete_dir {e'} $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
 
 
         set cmd "$name 'a b/"
-        assert_complete_dir {i'} $cmd "fixtures/_filedir"
+        assert_complete_dir {i'} $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
 
 
         set cmd "$name 'a\"b/"; #"
-        assert_complete_dir {d'} $cmd "fixtures/_filedir"
+        assert_complete_dir {d'} $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
@@ -154,9 +154,9 @@ foreach name {f f2} {
 
         set cmd "$name 'a\$b/"
         if {[lindex $::BASH_VERSINFO 0] == 4} {
-            assert_complete_dir {h'} $cmd "fixtures/_filedir"
+            assert_complete_dir {h'} $cmd "$::srcdir/fixtures/_filedir"
         } else {
-            assert_complete_dir "\b\b\b\b$::TESTDIR/fixtures/_filedir/a\$b/h'" $cmd "fixtures/_filedir"
+            assert_complete_dir "\b\b\b\b$::srcdirabs/fixtures/_filedir/a\$b/h'" $cmd "$::srcdir/fixtures/_filedir"
         }
 
 
@@ -166,8 +166,8 @@ foreach name {f f2} {
         # Execute these tests only when not running on Cygwin/Windows, because
         # directories containing `*' or `\' aren't allowed on Cygwin/Windows
         if {! [is_cygwin]} {
-            set cmd "$name 'a\\b/"
-            assert_complete_dir {g'} $cmd "fixtures/_filedir"
+            set cmd "$name '$TESTDIR/tmp/a\\b/"
+            assert_complete_dir {g'} $cmd "$TESTDIR/tmp"
 
 
             sync_after_int
@@ -175,63 +175,63 @@ foreach name {f f2} {
 
 
         set cmd "$name 'a&b/"
-        assert_complete_dir {f'} $cmd "fixtures/_filedir"
+        assert_complete_dir {f'} $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
 
 
         set cmd "$name \"ab/"; #"
-        assert_complete_dir {e"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {e"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
         sync_after_int
 
 
         set cmd "$name \"a b/"; #"
-        assert_complete_dir {i"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {i"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
         sync_after_int
 
 
         set cmd "$name \"a'b/"; #"
-        assert_complete_dir {c"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {c"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
         sync_after_int
 
 
         set cmd "$name \"a\\\"b/"; #"
-        assert_complete_dir {d"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {d"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
         sync_after_int
 
 
         set cmd "$name \"a\\\$b/"; #"
-        assert_complete_dir "\b\b\b\b\b$::TESTDIR/fixtures/_filedir/a\\\\\$b/h\\\"" $cmd "fixtures/_filedir"
+        assert_complete_dir "\b\b\b\b\b$::srcdirabs/fixtures/_filedir/a\\\\\$b/h\\\"" $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
 
 
         set cmd "$name \"a\\b/"; #"
-        assert_complete_dir "\b\b\bb/e\\\"" $cmd "fixtures/_filedir"
+        assert_complete_dir "\b\b\bb/e\\\"" $cmd "$::srcdir/fixtures/_filedir"
 
 
         sync_after_int
 
 
         set cmd "$name \"a\\\\b/"; #"
-        assert_complete_dir {g"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {g"} $cmd "$TESTDIR/tmp"; #"
 
 
         sync_after_int
 
 
         set cmd "$name \"a&b/"; #"
-        assert_complete_dir {f"} $cmd "fixtures/_filedir"; #"
+        assert_complete_dir {f"} $cmd "$::srcdir/fixtures/_filedir"; #"
 
 
         sync_after_int
@@ -242,7 +242,7 @@ foreach name {f f2} {
 
 
 set test "completing with filter '.e1' should show completions"
-assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "fixtures/_filedir/ext" $test
+assert_complete_dir {ee.e1 foo/ gg.e1 ii.E1} "g " "$::srcdir/fixtures/_filedir/ext" $test
 
 
 sync_after_int
@@ -259,7 +259,7 @@ if {
     [string first "UTF-8" $::LC_CTYPE] != -1 &&
     [string first 5.44 [exp_version]] != 0
 } {
-    assert_complete_dir g "f aé/" "fixtures/_filedir"
+    assert_complete_dir g "f aé/" "$::srcdir/fixtures/_filedir"
 } else {
     unsupported "$test"
 }
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 3276edb4..604b2d5e 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -1,4 +1,7 @@
 proc setup {} {
+    # NOTE: Changing dir to $SRCDIR is necessary because file locations in the
+    #       ssh config files (e.g. UserKnownHostsFile) are relative to $SRCDIR.
+    assert_bash_exec {cd $SRCDIR}
     save_env
 }
 
@@ -8,6 +11,7 @@ proc teardown {} {
         /COMPREPLY=/d
         /OLDHOME=/d
     }
+    assert_bash_exec {cd $TESTDIR}
 }
 
 
@@ -79,7 +83,7 @@ set hosts [get_hosts]
 lappend hosts two three
 set hosts [join [bash_sort $hosts] "\\s+"]
     # Setup environment
-set cmd {OLDHOME=$HOME; HOME=$TESTDIR}
+set cmd {OLDHOME=$HOME; HOME=$SRCDIRABS}
 send "$cmd\r"
 expect -ex "$cmd\r\n/@"
     # Call _known_hosts
diff --git a/test/unit/compgen.exp b/test/unit/compgen.exp
index 8596cfa5..6e6f79c6 100644
--- a/test/unit/compgen.exp
+++ b/test/unit/compgen.exp
@@ -18,9 +18,8 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set test {compgen -f a\\\'b/ on bash-4 should return a\'b/c};
     set cmd {compgen -f a\\\'b/}
 }
-set dir fixtures/compgen
-set prompt "/$dir/@"
-assert_bash_exec "cd $dir" "" $prompt
+set dir $::srcdir/fixtures/compgen
+assert_bash_exec "cd $dir"
 send "$cmd\r"
 expect -ex "$cmd\r\n"
 expect {
@@ -37,13 +36,13 @@ expect {
         if {[lindex $::BASH_VERSINFO 0] <= 3 } \
             {pass $test} else {fail $test}
     }
-    -re $prompt { pass "$test" }
+    -re /@ { pass "$test" }
     -re eof { unresolved "eof" }
 }
-sync_after_int $prompt
+sync_after_int
 assert_bash_exec {cd "$TESTDIR"}
 
-#assert_bash_list_dir {a\\\'b/c} $cmd fixtures/compgen
+#assert_bash_list_dir {a\\\'b/c} $cmd $::srcdir/fixtures/compgen
 
 
 sync_after_int

From 6feb44ac0f5ca2f96d4ca6a20a7edd63ae02a103 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Sat, 13 Nov 2010 09:30:26 +0100
Subject: [PATCH 170/214] (testsuite) Add missing dir to fixtures/acroread

---
 test/fixtures/acroread/foo.d/.gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/fixtures/acroread/foo.d/.gitignore

diff --git a/test/fixtures/acroread/foo.d/.gitignore b/test/fixtures/acroread/foo.d/.gitignore
new file mode 100644
index 00000000..e69de29b

From be5c8f424937d1aefa5455685334050a093b9d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 13 Nov 2010 10:46:02 +0200
Subject: [PATCH 171/214] (testsuite) Ignore changed OLDPWD in xz.exp.

---
 test/lib/completions/xz.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
index 4bc783a9..6e6b29ca 100644
--- a/test/lib/completions/xz.exp
+++ b/test/lib/completions/xz.exp
@@ -4,7 +4,7 @@ proc setup {} {
 
 
 proc teardown {} {
-    assert_env_unmodified
+    assert_env_unmodified {/OLDPWD=/d}
 }
 
 

From 07f76d8f6c8deae4f0a996f98706a7e737506f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 13 Nov 2010 11:15:47 +0200
Subject: [PATCH 172/214] (testsuite) Fix cvs, cvsps, java, lftp, and wol
 fallout from commit c86b336.

---
 test/lib/completions/cvs.exp   | 2 +-
 test/lib/completions/cvsps.exp | 2 +-
 test/lib/completions/java.exp  | 2 +-
 test/lib/completions/lftp.exp  | 2 +-
 test/lib/completions/wol.exp   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
index f6853946..3b2643d3 100644
--- a/test/lib/completions/cvs.exp
+++ b/test/lib/completions/cvs.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-    assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
+    assert_bash_exec {OLDHOME=$HOME ; HOME=$SRCDIR/fixtures/cvs}
 }
 
 
diff --git a/test/lib/completions/cvsps.exp b/test/lib/completions/cvsps.exp
index def4a11b..6cf95ac1 100644
--- a/test/lib/completions/cvsps.exp
+++ b/test/lib/completions/cvsps.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-    assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
+    assert_bash_exec {OLDHOME=$HOME ; HOME=$SRCDIR/fixtures/cvs}
 }
 
 
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 8864baf2..842501d2 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -1,5 +1,5 @@
 proc setup {} {
-    assert_bash_exec {CLASSPATH=$TESTDIR/fixtures/java/a:$TESTDIR/fixtures/java/bashcomp.jar}
+    assert_bash_exec {CLASSPATH=$SRCDIR/fixtures/java/a:$SRCDIR/fixtures/java/bashcomp.jar}
     save_env
 }
 
diff --git a/test/lib/completions/lftp.exp b/test/lib/completions/lftp.exp
index 9fcc9a67..bb219650 100644
--- a/test/lib/completions/lftp.exp
+++ b/test/lib/completions/lftp.exp
@@ -1,5 +1,5 @@
 proc setup {} {
-    assert_bash_exec {HOME=$TESTDIR/fixtures/lftp}
+    assert_bash_exec {HOME=$SRCDIR/fixtures/lftp}
     save_env
 }
 
diff --git a/test/lib/completions/wol.exp b/test/lib/completions/wol.exp
index a06a2ae9..a4ac9e4e 100644
--- a/test/lib/completions/wol.exp
+++ b/test/lib/completions/wol.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     # See fixtures/shared/bin/{arp,ifconfig}
-    assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/shared/bin:$PATH";}
+    assert_bash_exec {OLDPATH="$PATH"; PATH="$SRCDIR/fixtures/shared/bin:$PATH";}
     save_env
 }
 

From 6934a508efc9e85ce16877beab1b41c3f7d2bfc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 16 Nov 2010 21:09:23 +0200
Subject: [PATCH 173/214] Test for availability of compopt before invoking it
 in _compopt_o_filenames().

Invoking it there on bash < 4 may cause terminal echo to be turned off for
some weird reason (RedHat: #653669).
---
 bash_completion | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bash_completion b/bash_completion
index 32472787..d9e1b66a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -613,7 +613,10 @@ _quote_readline_by_ref()
 # the bash < 4 compgen hack.
 _compopt_o_filenames()
 {
-    compopt -o filenames 2>/dev/null || \
+    # We test for compopt availability first because directly invoking it on
+    # bash < 4 at this point may cause terminal echo to be turned off for some
+    # reason, see https://bugzilla.redhat.com/653669 for more info.
+    type compopt &>/dev/null && compopt -o filenames 2>/dev/null || \
         compgen -f /non-existing-dir/ >/dev/null
 }
 

From 88924b0cac330d8df3c50e5919d4dfaf0c353f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 16 Nov 2010 22:25:01 +0200
Subject: [PATCH 174/214] Comment spelling fix.

---
 completions/helpers/perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/helpers/perl b/completions/helpers/perl
index dc44d71f..3c3a56b0 100755
--- a/completions/helpers/perl
+++ b/completions/helpers/perl
@@ -8,7 +8,7 @@ my %seen;
 sub print_modules_real {
     my ($base, $dir, $word) = @_;
 
-    # returns immediatly if the base doesn't match
+    # return immediately if the base doesn't match
     return if $base && $base !~ /^\Q$word/;
 
     chdir($dir) or return;

From 5b8596231cae2869d0ddf8074d07d3202477f4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 16 Nov 2010 22:47:31 +0200
Subject: [PATCH 175/214] Fix perl module colon completion trimming.

---
 completions/perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/perl b/completions/perl
index 1aa9d2f1..87058414 100644
--- a/completions/perl
+++ b/completions/perl
@@ -5,7 +5,7 @@ have perl &&
 _perlmodules()
 {
     COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
-    __ltrim_colon_completions "$1"
+    __ltrim_colon_completions "$prefix$cur"
 }
 
 _perlfunctions()

From 53062bbae2a9026fc2585b09ad375a31ae6122cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 16 Nov 2010 22:59:36 +0200
Subject: [PATCH 176/214] Don't bother passing unused arg to _perlmodules().

---
 completions/perl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/completions/perl b/completions/perl
index 87058414..839846ae 100644
--- a/completions/perl
+++ b/completions/perl
@@ -41,7 +41,7 @@ _perl()
             return 0
             ;;
         -m|-M)
-            _perlmodules "$cur"
+            _perlmodules
             return 0
             ;;
     esac
@@ -84,7 +84,7 @@ _perldoc()
     else
         # return available modules (unless it is clearly a file)
         if [[ "$cur" != */* ]]; then
-            _perlmodules "$cur"
+            _perlmodules
             COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
                 '$( PAGER=/bin/cat man perl |  \
                 sed -ne "/perl.*Perl overview/,/perlwin32/p" | \

From c4eaba636f56ee52029fe6530ea4065ede489380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 16 Nov 2010 23:20:46 +0200
Subject: [PATCH 177/214] (testsuite) Add some perl module completion test
 cases (Alioth: #312832).

The -MFile::Sp and -MFile::Spec::Func test cases fail at the moment
but are not marked as expected failures, hoping for a quick fix for
the above bug ;)
---
 test/lib/completions/perl.exp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 8be41621..906433d1 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -91,5 +91,15 @@ assert_complete $options "perl -"
 
 sync_after_int
 
+# Assuming that File::Spec and friends are always installed...
+
+assert_complete_any "perl -MFile"
+sync_after_int
+
+assert_complete_any "perl -MFile::Sp"
+sync_after_int
+
+assert_complete_any "perl -MFile::Spec::Func"
+sync_after_int
 
 teardown

From 2b6f8de738814e4912da678ea62ee3d8d571a60d Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Tue, 16 Nov 2010 22:32:13 +0100
Subject: [PATCH 178/214] drop -o nospace option (fix #312831)

---
 completions/perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/perl b/completions/perl
index 839846ae..feaeee55 100644
--- a/completions/perl
+++ b/completions/perl
@@ -53,7 +53,7 @@ _perl()
         _filedir
     fi
 }
-complete -F _perl -o nospace perl
+complete -F _perl perl
 
 _perldoc()
 {

From d2e8e66f096b4dae2305cd0ca8acef8705c77dff Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
Date: Tue, 16 Nov 2010 23:05:08 +0100
Subject: [PATCH 179/214] fix optimisation (bug #312832), and explain the code

---
 completions/helpers/perl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/completions/helpers/perl b/completions/helpers/perl
index 3c3a56b0..b3522ac0 100755
--- a/completions/helpers/perl
+++ b/completions/helpers/perl
@@ -8,8 +8,16 @@ my %seen;
 sub print_modules_real {
     my ($base, $dir, $word) = @_;
 
-    # return immediately if the base doesn't match
-    return if $base && $base !~ /^\Q$word/;
+    # return immediatly if potential completion doesn't match current word
+    # a double comparaison is used to avoid dealing with string lengths
+    # (the shorter being the pattern to be used as the regexp)
+    # word 'Fi', base 'File' -> match 'File' against 'Fi'
+    # word 'File::Sp', base 'File' -> match 'File::Sp' againt 'File'
+    return if
+        $base               &&
+        $word               &&
+        $base !~ /^\Q$word/ &&
+        $word !~ /^\Q$base/;
 
     chdir($dir) or return;
 

From 69f9c7c77e115062be0090171d8711f6695a0aa8 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Tue, 16 Nov 2010 23:06:13 +0100
Subject: [PATCH 180/214] (testsuite) Fix _count_args tests to output newline
 assert_bash_list() expects a newline terminated list

Plus small fixes to assert_bash_list_dir()
---
 test/lib/library.exp      | 11 +++----
 test/unit/_count_args.exp | 62 +++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index 92aef075..7165509b 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -115,15 +115,16 @@ proc assert_bash_list {expected cmd test {args {}}} {
 #                      if empty string.
 # @param list $args  Options:
 #                    -sort           Compare list sorted.  Default is unsorted
-#                    -prompt         Bash prompt.  Default is `/$dir/@'
+#                    -prompt         Bash prompt.  Default is `/@'
 #                    -chunk-size N   Compare list N items at a time.  Default 
 #                                    is 20.
 proc assert_bash_list_dir {expected cmd dir test {args {}}} {
     array set arg [::cmdline::getoptions args {
-        {sort                      "compare list sorted"}
-        {prompt.arg     "/$dir/@"  "bash prompt"}
-        {chunk-size.arg 20         "compare N list items at a time"}
+        {sort                 "compare list sorted"}
+        {prompt.arg     "/@"  "bash prompt"}
+        {chunk-size.arg 20    "compare N list items at a time"}
     }]
+    set prompt $arg(prompt)
     if {$arg(sort)} {set arg_sort "-sort"} else {set arg_sort ""}
     assert_bash_exec "cd $dir" "" $prompt
     assert_bash_list $expected $cmd $test $arg_sort \
@@ -654,7 +655,7 @@ proc match_items {items {args {}}} {
             set item "[lindex $items [expr {$i + $j}]]"
             _escape_regexp_chars item
             append expected $item
-            if {[llength $items] > 1} {append expected {\s+}};
+            if {[llength $items] > 1} {append expected {\s+}}
         }
         if {[llength $items] == 1} {
             expect {
diff --git a/test/unit/_count_args.exp b/test/unit/_count_args.exp
index a1419481..34284108 100644
--- a/test/unit/_count_args.exp
+++ b/test/unit/_count_args.exp
@@ -26,43 +26,43 @@ sync_after_int
 
 
 set test "a b| should set args to 1";  # | = cursor position
-set cmd {COMP_WORDS=(a b); COMP_CWORD=1; COMP_LINE='a b'; COMP_POINT=3; _count_args; echo -n $args}
+set cmd {COMP_WORDS=(a b); COMP_CWORD=1; COMP_LINE='a b'; COMP_POINT=3; _count_args; echo $args}
 assert_bash_list 1 $cmd $test
 
 
 sync_after_int
 
 
-set test "a b|c should set args to 1";  # | = cursor position
-set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _count_args; echo -n $args}
-assert_bash_list 1 $cmd $test
-
-
-sync_after_int
-
-
-set test "a b c| should set args to 2";  # | = cursor position
-set cmd {COMP_WORDS=(a b c); COMP_CWORD=2; COMP_LINE='a b c'; COMP_POINT=4; _count_args; echo -n $args}
-assert_bash_list 2 $cmd $test
-
-
-sync_after_int
-
-
-set test "a b| c should set args to 1";  # | = cursor position
-set cmd {COMP_WORDS=(a b c); COMP_CWORD=1; COMP_LINE='a b c'; COMP_POINT=3; _count_args; echo -n $args}
-assert_bash_list 1 $cmd $test
-
-
-sync_after_int
-
-
-set test "a b -c| d should set args to 2";  # | = cursor position
-set cmd {COMP_WORDS=(a b -c d); COMP_CWORD=2; COMP_LINE='a b -c d'; COMP_POINT=6; _count_args; echo -n $args}
-assert_bash_list 2 $cmd $test
-
-
-sync_after_int
+#set test "a b|c should set args to 1";  # | = cursor position
+#set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _count_args; echo $args}
+#assert_bash_list 1 $cmd $test
+#
+#
+#sync_after_int
+#
+#
+#set test "a b c| should set args to 2";  # | = cursor position
+#set cmd {COMP_WORDS=(a b c); COMP_CWORD=2; COMP_LINE='a b c'; COMP_POINT=4; _count_args; echo $args}
+#assert_bash_list 2 $cmd $test
+#
+#
+#sync_after_int
+#
+#
+#set test "a b| c should set args to 1";  # | = cursor position
+#set cmd {COMP_WORDS=(a b c); COMP_CWORD=1; COMP_LINE='a b c'; COMP_POINT=3; _count_args; echo $args}
+#assert_bash_list 1 $cmd $test
+#
+#
+#sync_after_int
+#
+#
+#set test "a b -c| d should set args to 2";  # | = cursor position
+#set cmd {COMP_WORDS=(a b -c d); COMP_CWORD=2; COMP_LINE='a b -c d'; COMP_POINT=6; _count_args; echo $args}
+#assert_bash_list 2 $cmd $test
+#
+#
+#sync_after_int
 
 
 teardown

From bc0bf2815cf31676a0c014ee5e9f5d03edc6fc1c Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Tue, 16 Nov 2010 23:21:05 +0100
Subject: [PATCH 181/214] (testsuite) Uncomment testcases

---
 test/unit/_count_args.exp | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/test/unit/_count_args.exp b/test/unit/_count_args.exp
index 34284108..b615cab8 100644
--- a/test/unit/_count_args.exp
+++ b/test/unit/_count_args.exp
@@ -33,36 +33,36 @@ assert_bash_list 1 $cmd $test
 sync_after_int
 
 
-#set test "a b|c should set args to 1";  # | = cursor position
-#set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _count_args; echo $args}
-#assert_bash_list 1 $cmd $test
-#
-#
-#sync_after_int
-#
-#
-#set test "a b c| should set args to 2";  # | = cursor position
-#set cmd {COMP_WORDS=(a b c); COMP_CWORD=2; COMP_LINE='a b c'; COMP_POINT=4; _count_args; echo $args}
-#assert_bash_list 2 $cmd $test
-#
-#
-#sync_after_int
-#
-#
-#set test "a b| c should set args to 1";  # | = cursor position
-#set cmd {COMP_WORDS=(a b c); COMP_CWORD=1; COMP_LINE='a b c'; COMP_POINT=3; _count_args; echo $args}
-#assert_bash_list 1 $cmd $test
-#
-#
-#sync_after_int
-#
-#
-#set test "a b -c| d should set args to 2";  # | = cursor position
-#set cmd {COMP_WORDS=(a b -c d); COMP_CWORD=2; COMP_LINE='a b -c d'; COMP_POINT=6; _count_args; echo $args}
-#assert_bash_list 2 $cmd $test
-#
-#
-#sync_after_int
+set test "a b|c should set args to 1";  # | = cursor position
+set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _count_args; echo $args}
+assert_bash_list 1 $cmd $test
+
+
+sync_after_int
+
+
+set test "a b c| should set args to 2";  # | = cursor position
+set cmd {COMP_WORDS=(a b c); COMP_CWORD=2; COMP_LINE='a b c'; COMP_POINT=4; _count_args; echo $args}
+assert_bash_list 2 $cmd $test
+
+
+sync_after_int
+
+
+set test "a b| c should set args to 1";  # | = cursor position
+set cmd {COMP_WORDS=(a b c); COMP_CWORD=1; COMP_LINE='a b c'; COMP_POINT=3; _count_args; echo $args}
+assert_bash_list 1 $cmd $test
+
+
+sync_after_int
+
+
+set test "a b -c| d should set args to 2";  # | = cursor position
+set cmd {COMP_WORDS=(a b -c d); COMP_CWORD=2; COMP_LINE='a b -c d'; COMP_POINT=6; _count_args; echo $args}
+assert_bash_list 2 $cmd $test
+
+
+sync_after_int
 
 
 teardown

From 11da957e4590564bdf97f06ef6a3c02c84716f3a Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Wed, 17 Nov 2010 23:36:58 +0100
Subject: [PATCH 182/214] (testsuite) `match_items()' matches on bash-prompt
 Also made `match_items()' more strict about matching space/newline/prompt
 after the last item.

Added options to match_items():
- end-newline
- end-prompt
- end-space
and transferred them to other functions.

Function `assert_complete()' now has a `-nospace' option to explicitly
disallow a space after a completion...

Function `assert_bash_list()' now expects a single item to be followed
by a newline.
---
 test/lib/completions/cd.exp          |   3 +-
 test/lib/completions/finger.exp      |   2 +-
 test/lib/completions/ls.exp          |   4 +-
 test/lib/completions/ssh.exp         |   4 +-
 test/lib/completions/sudo.exp        |   5 +-
 test/lib/library.exp                 | 114 ++++++++++++++++-----------
 test/unit/__expand_tilde_by_ref.exp  |  12 +--
 test/unit/_filedir.exp               |   2 +-
 test/unit/_get_comp_words_by_ref.exp |   2 +-
 test/unit/_get_cword.exp             |  28 +++----
 test/unit/_tilde.exp                 |   4 +-
 11 files changed, 104 insertions(+), 76 deletions(-)

diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index c32e11c1..1361b3c6 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -39,7 +39,8 @@ set test "Tab should complete CDPATH"
     # Set CDPATH
 assert_bash_exec "declare -p CDPATH &>/dev/null && OLDCDPATH=\$CDPATH || :"
 assert_bash_exec "CDPATH=\$PWD";
-assert_complete "$::srcdir/fixtures/shared/default/foo.d/" "cd $::srcdir/fixtures/shared/default/fo" $test
+assert_complete "$::srcdir/fixtures/shared/default/foo.d/" \
+    "cd $::srcdir/fixtures/shared/default/fo" $test -nospace
 sync_after_int
     # Reset CDPATH
 assert_bash_exec "declare -p OLDCDPATH &>/dev/null && CDPATH=\$OLDCDPATH || unset CDPATH && unset OLDCDPATH"
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index f139c962..70e3ed2c 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -24,7 +24,7 @@ sync_after_int
 
 
 set test "Tab should complete partial username"
-assert_complete_partial [exec bash -c "compgen -A user"] "finger"
+assert_complete_partial [exec bash -c "compgen -A user"] "finger" -nospace
 
 
 sync_after_int
diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index 5aafddb4..0d16ec03 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -24,7 +24,7 @@ set test "~part should complete to ~full/ if existing dir"
 assert_bash_exec {for u in $(compgen -u); do \
     eval test -d ~$u && echo $u; unset u; done} {} /@ users
 find_unique_completion_pair $users part full
-assert_complete "~$full/" "ls ~$part" $test
+assert_complete "~$full/" "ls ~$part" $test -nospace
 
 
 sync_after_int
@@ -35,7 +35,7 @@ set test "~part should complete to ~full<space> if non-existing dir"
 assert_bash_exec {for u in $(compgen -u); do \
     eval test -d ~$u || echo $u; unset u; done} {} /@ users
 find_unique_completion_pair $users part full
-assert_complete "~$full " "ls ~$part" $test
+assert_complete "~$full " "ls ~$part" $test -nospace
 
 
 sync_after_int
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index d16b5f98..217fa2c3 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -61,8 +61,8 @@ sync_after_int
 
 
 set test "First argument should complete partial hostname"
-assert_complete_partial [get_hosts] ssh "" $test /@ 20 \
-    [list "ltrim_colon_completions"]
+assert_complete_partial [get_hosts] ssh "" $test \
+    -filters "ltrim_colon_completions"
 
 
 sync_after_int
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index a4b7690a..d6bbbbb6 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -11,13 +11,14 @@ proc teardown {} {
 setup
 
 
-assert_complete_dir foo.d/ "sudo cd fo" $::srcdir/fixtures/shared/default
+assert_complete_dir foo.d/ "sudo cd fo" $::srcdir/fixtures/shared/default \
+    "" -nospace
 
 
 sync_after_int
 
 
-assert_complete_dir fixtures/ "sudo sh fix" $::srcdir
+assert_complete_dir fixtures/ "sudo sh fix" $::srcdir "" -nospace
 
 
 sync_after_int
diff --git a/test/lib/library.exp b/test/lib/library.exp
index 7165509b..ace83dc9 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -89,15 +89,13 @@ proc assert_bash_list {expected cmd test {args {}}} {
     } else {
         send "$cmd\r"
         expect -ex "$cmd\r\n"
-        if {$arg(sort)} {set bash_sort "-bash-sort"} else {set bash_sort ""}
+        if {$arg(sort)} {set bash_sort "-bash-sort"} {set bash_sort ""}
         if {[
-            match_items $expected $bash_sort -chunk-size $arg(chunk-size) \
-                -prompt $prompt
+            eval match_items \$expected $bash_sort -chunk-size \
+                \$arg(chunk-size) -end-newline -end-prompt \
+                -prompt \$prompt
         ]} {
-            expect {
-                -re $prompt { pass "$test" }
-                -re eof { unresolved "eof" }
-            }
+            pass "$test"
         } else {
             fail "$test"
         }
@@ -138,21 +136,34 @@ proc assert_bash_list_dir {expected cmd dir test {args {}}} {
 # command.
 # @param list $expected  Expected completions.
 # @param string $cmd  Command given to generate items
-# @param string $test  (optional) Test title.  Default is "$cmd<TAB> should show completions"
-# @param string $prompt  (optional) Bash prompt.  Default is "/@"
-# @param integer $size  (optional) Chunk size.  Default is 20.
-# @param string $cword  (optional) Last argument of $cmd which is an
-#     argument-to-complete and to be replaced with the longest common prefix
-#     of $expected.  If empty string (default), `assert_complete' autodetects
-#     if the last argument is an argument-to-complete by checking if $cmd
-#     doesn't end with whitespace.  Specifying `cword' should only be necessary
-#     if this autodetection fails, e.g.  when the last whitespace is escaped or
-#     quoted, e.g. "finger foo\ " or "finger 'foo "
-# @param list $filters  (optional) List of filters to apply to this function to tweak
-#     the expected completions and argument-to-complete.  Possible values:
-#     - "ltrim_colon_completions"
+# @param string $test  Test title
+# @param list $args  Options:
+#     -prompt PROMPT  Bash prompt.  Default is `/@'
+#     -chunk-size CHUNK-SIZE   Compare list CHUNK-SIZE items at
+#         a time.  Default is 20.
+#     -cword CWORD  Last argument of $cmd which is an argument-to-complete and
+#         to be replaced with the longest common prefix of $expected.  If empty
+#         string (default), `assert_complete' autodetects if the last argument
+#         is an argument-to-complete by checking if $cmd doesn't end with
+#         whitespace.  Specifying `cword' should only be necessary if this
+#         autodetection fails, e.g.  when the last whitespace is escaped or
+#         quoted, e.g. "finger foo\ " or "finger 'foo "
+#     -nospace  Don't expect space character to be output after completion match.
+#     -filters  List of filters to apply to this function to tweak the expected
+#         completions and argument-to-complete.  Possible values:
+#         - "ltrim_colon_completions"
+#proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {filters ""}} {
 # @result boolean  True if successful, False if not
-proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {filters ""}} {
+proc assert_complete {expected cmd {test ""} {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {prompt.arg     "/@" "bash prompt"}
+        {chunk-size.arg 20   "compare N list items at a time"}
+        {cword.arg      ""   "word to complete"}
+        {nospace             "don't expect space after completion"}
+        {filters.arg    ""   "filters to preprocess expected completions"}
+    }]
+    set cword $arg(cword)
+    set prompt $arg(prompt)
     if {[llength $expected] == 0} {
         assert_no_complete $cmd $test
     } else {
@@ -161,7 +172,7 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
         if {[llength $expected] == 1} {
             expect -ex "$cmd"
 
-            if {[lsearch -exact $filters "ltrim_colon_completions"] == -1} {
+            if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] == -1} {
                 set cur "";  # Default to empty word to complete on
                 set words [split_words_bash $cmd]
                 if {[llength $words] > 1} {
@@ -180,20 +191,24 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
             set expected [lsort -unique $expected]
         }
 
-        if {[lsearch -exact $filters "ltrim_colon_completions"] != -1} {
+        if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] != -1} {
                 # If partial contains colon (:), remove partial from begin of items
                 # See also: bash_completion.__ltrim_colon_completions()
             _ltrim_colon_completions cword expected
         }
 
-        if {[match_items $expected -bash-sort -chunk-size $size -prompt $prompt]} {
+        if {$arg(nospace)} {set endspace ""} else {set endspace "-end-space"}
+        if {[
+            eval match_items \$expected -bash-sort -chunk-size \
+                \$arg(chunk-size) $endspace -prompt \$prompt
+        ]} {
             if {[llength $expected] == 1} {
                 pass "$test"
             } else {
                 # Remove optional (partial) last argument-to-complete from `cmd',
                 # E.g. "finger test@" becomes "finger"
 
-                if {[lsearch -exact $filters "ltrim_colon_completions"] != -1} {
+                if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] != -1} {
                     set cmd2 $cmd
                 } else {
                     set cmd2 [_remove_cword_from_cmd $cmd $cword]
@@ -290,15 +305,13 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
 # @param list $expected
 # @param string $cmd  Command given to generate items
 # @param string $dir  Subdirectory to attempt completion in.  The directory must be relative from the $TESTDIR and without a trailing slash.  E.g. `fixtures/evince'
-# @param string $test  (optional) Test title.  Default is "$cmd<TAB> should show completions"
-# @param string $prompt  (optional) Bash prompt.  Default is "/@"
-# @param integer $size  (optional) Chunk size.  Default is 20.
-# @param string $cword  (optional) Last word of $cmd to complete.  See: assert_complete()
+# @param string $test  Test title
+# @param list $args  See: assert_complete()
 # @result boolean  True if successful, False if not
-proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
+proc assert_complete_dir {expected cmd dir {test ""} {args {}}} {
     set prompt "/@"
     assert_bash_exec "cd $dir" "" $prompt
-    assert_complete $expected $cmd $test $prompt $size $cword
+    assert_complete $expected $cmd $test $args
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
 }
@@ -312,14 +325,9 @@ proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
 # @param list $expected  List of all completions.
 # @param string $cmd  Command given to generate items
 # @param string $partial  Word to complete
-# @param string $test  (optional) Test title.  Default is "$cmd<TAB> should show completions"
-# @param string $prompt  (optional) Bash prompt.  Default is "/@"
-# @param integer $size  (optional) Chunk size.  Default is 20.
-# @param list $filters  (optional) List of filters to apply to this function to tweak
-#     the expected completions and argument-to-complete.
-#     @see assert_complete()
-# @result boolean  True if successful, False if not
-proc assert_complete_partial {expected cmd {partial ""} {test ""} {prompt /@} {size 20} {filters ""}} {
+# @param string $test  Test title
+# @param list $args  See: assert_complete()
+proc assert_complete_partial {expected cmd {partial ""} {test ""} {args {}}} {
     if {$test == ""} {set test "$cmd should complete partial argument"}
     if {[llength $expected] == 0} {
         unresolved "$test"
@@ -334,7 +342,7 @@ proc assert_complete_partial {expected cmd {partial ""} {test ""} {prompt /@} {s
                 lappend pick $item
             }
         }
-        assert_complete $pick "$cmd $partial" $test $prompt $size $partial $filters
+        assert_complete $pick "$cmd $partial" $test $args
     }
 }
 
@@ -637,12 +645,22 @@ proc is_cygwin {} {
 #                    -prompt PROMPT  Bash prompt.  Default is `/@'
 #                    -chunk-size CHUNK-SIZE   Compare list CHUNK-SIZE items at
 #                                             a time.  Default is 20.
+#                    -end-newline  Expect newline after last item.
+#                                  Default is not.
+#                    -end-prompt   Expect prompt after last item.
+#                                  Default is not.
+#                    -end-space    Expect single space after last item.
+#                                  Default is not.  Valid only if
+#                                  `end-newline' not set.
 # @result boolean  True if successful, False if not
 proc match_items {items {args {}}} {
     array set arg [::cmdline::getoptions args {
         {bash-sort      "compare list sorted"}
         {prompt.arg     "/@" "bash prompt"}
         {chunk-size.arg 20   "compare N list items at a time"}
+        {end-newline   "expect newline after last item"}
+        {end-prompt    "expect prompt after last item"}
+        {end-space     "expect space ater last item"}
     }]
     set prompt $arg(prompt)
     set size $arg(chunk-size)
@@ -658,12 +676,20 @@ proc match_items {items {args {}}} {
             if {[llength $items] > 1} {append expected {\s+}}
         }
         if {[llength $items] == 1} {
+            if {$arg(end-prompt)} {set end $prompt} {set end ""}
+            # Both trailing space and newline are specified?
+            if {$arg(end-newline) && $arg(end-space)} {
+                # Indicate both trailing space or newline are ok
+                set expected2 "|^$expected $end$";  # Include space
+                append expected "\r\n$end";      # Include newline
+            } else {
+                if {$arg(end-newline)} {append expected "\r\n$end"}
+                if {$arg(end-space)}   {append expected " $end"}
+                set expected2 ""
+            }
             expect {
-                -re "^$expected\r\n$" { set result true }
-                # NOTE: The optional space ( ?) depends on whether -o nospace is active
-                -re "^$expected ?$" { set result true }
+                -re "^$expected$$expected2" { set result true }
                 -re "^$prompt$" {set result false; break }
-                "\r\n" { set result false; break }
                 default { set result false; break }
                 timeout { set result false; break }
             }
diff --git a/test/unit/__expand_tilde_by_ref.exp b/test/unit/__expand_tilde_by_ref.exp
index 000d3516..abd549cb 100644
--- a/test/unit/__expand_tilde_by_ref.exp
+++ b/test/unit/__expand_tilde_by_ref.exp
@@ -37,7 +37,7 @@ sync_after_int
 
 
 set test "~user should return /home/user"
-set cmd [format {var="~%s"; __expand_tilde_by_ref var; printf "%%s" "$var"} $user]
+set cmd [format {var="~%s"; __expand_tilde_by_ref var; printf "%%s\n" "$var"} $user]
 assert_bash_list "$home" $cmd $test
 
 
@@ -45,7 +45,7 @@ sync_after_int
 
 
 set test "~/foo should return /home/user/foo"
-set cmd {var='~/foo'; __expand_tilde_by_ref var; printf "%s" "$var"}
+set cmd {var='~/foo'; __expand_tilde_by_ref var; printf "%s\n" "$var"}
 assert_bash_list "$home/foo" $cmd $test
 
 
@@ -53,7 +53,7 @@ sync_after_int
 
 
 set test "~user/bar should return /home/user/bar"
-set cmd [format {var="~%s/bar"; __expand_tilde_by_ref var; printf "%%s" "$var"} $user]
+set cmd [format {var="~%s/bar"; __expand_tilde_by_ref var; printf "%%s\n" "$var"} $user]
 assert_bash_list "$home/bar" $cmd $test
 
 
@@ -61,7 +61,7 @@ sync_after_int
 
 
 set test "~user/\$HOME should return /home/user/\$HOME"
-set cmd [format {var="~%s/\$HOME"; __expand_tilde_by_ref var; printf "%%s" "$var"} $user]
+set cmd [format {var="~%s/\$HOME"; __expand_tilde_by_ref var; printf "%%s\n" "$var"} $user]
 assert_bash_list "$home/\$HOME" $cmd $test
 
 
@@ -69,7 +69,7 @@ sync_after_int
 
 
 set test "'~user/a  b' should return '/home/user/a  b'"
-set cmd [format {var="~%s/a  b"; __expand_tilde_by_ref var; printf "%%s" "$var"} $user]
+set cmd [format {var="~%s/a  b"; __expand_tilde_by_ref var; printf "%%s\n" "$var"} $user]
 assert_bash_list [list [format {%s/a  b} $home]] $cmd $test
 
 
@@ -77,7 +77,7 @@ sync_after_int
 
 
 set test "~user/* should return /home/user/*"
-set cmd [format {var="~%s/*"; __expand_tilde_by_ref var; printf "%%s" "$var"} $user]
+set cmd [format {var="~%s/*"; __expand_tilde_by_ref var; printf "%%s\n" "$var"} $user]
 assert_bash_list "$home/\*" $cmd $test
 
 
diff --git a/test/unit/_filedir.exp b/test/unit/_filedir.exp
index 7c8c4205..de494084 100644
--- a/test/unit/_filedir.exp
+++ b/test/unit/_filedir.exp
@@ -118,7 +118,7 @@ foreach name {f f2} {
 
     set test "completing $name a\$ should return a\\\$b/"
     set cmd "$name a\$"
-    assert_complete_dir "\b\\\\\$b/" $cmd "$::srcdir/fixtures/_filedir" $test
+    assert_complete_dir "\b\\\\\$b/" $cmd "$::srcdir/fixtures/_filedir" $test -nospace
 
 
     sync_after_int
diff --git a/test/unit/_get_comp_words_by_ref.exp b/test/unit/_get_comp_words_by_ref.exp
index cb3f4dad..2ddcef23 100644
--- a/test/unit/_get_comp_words_by_ref.exp
+++ b/test/unit/_get_comp_words_by_ref.exp
@@ -247,7 +247,7 @@ sync_after_int
 set test "a -n| should return -n";  # | = cursor position
 set cmd {COMP_WORDS=(a -n); COMP_CWORD=1; COMP_LINE='a -n'; COMP_POINT=4}
 assert_bash_exec $cmd
-set cmd {_get_comp_words_by_ref cur; printf %s $cur}
+set cmd {_get_comp_words_by_ref cur; printf "%s\n" $cur}
 assert_bash_list -n $cmd $test
 
 
diff --git a/test/unit/_get_cword.exp b/test/unit/_get_cword.exp
index c3fbe2ae..ce749cec 100644
--- a/test/unit/_get_cword.exp
+++ b/test/unit/_get_cword.exp
@@ -30,7 +30,7 @@ sync_after_int
 
 
 set test "a b| should return b";  # | = cursor position
-set cmd {COMP_WORDS=(a b); COMP_CWORD=1; COMP_LINE='a b'; COMP_POINT=3; _get_cword}
+set cmd {COMP_WORDS=(a b); COMP_CWORD=1; COMP_LINE='a b'; COMP_POINT=3; _get_cword; echo}
 assert_bash_list b $cmd $test
 
 
@@ -65,7 +65,7 @@ sync_after_int
 
 
 set test "a b|c should return b";  # | = cursor position
-set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _get_cword}
+set cmd {COMP_WORDS=(a bc); COMP_CWORD=1; COMP_LINE='a bc'; COMP_POINT=3; _get_cword; echo}
 assert_bash_list b $cmd $test
 
 
@@ -73,7 +73,7 @@ sync_after_int
 
 
 set test {a b\ c| should return b\ c};  # | = cursor position
-set cmd {COMP_WORDS=(a 'b\ c'); COMP_CWORD=1; COMP_LINE='a b\ c'; COMP_POINT=6; _get_cword}
+set cmd {COMP_WORDS=(a 'b\ c'); COMP_CWORD=1; COMP_LINE='a b\ c'; COMP_POINT=6; _get_cword; echo}
 assert_bash_list {"b\\ c"} $cmd $test
 
 
@@ -81,7 +81,7 @@ sync_after_int
 
 
 set test {a b\| c should return b\ };  # | = cursor position
-set cmd {COMP_WORDS=(a 'b\ c'); COMP_CWORD=1; COMP_LINE='a b\ c'; COMP_POINT=4; _get_cword}
+set cmd {COMP_WORDS=(a 'b\ c'); COMP_CWORD=1; COMP_LINE='a b\ c'; COMP_POINT=4; _get_cword; echo}
 assert_bash_list {"b\\"} $cmd $test
 
 
@@ -89,7 +89,7 @@ sync_after_int
 
 
 set test {a "b\| should return "b\ };  # | = cursor position
-set cmd {COMP_WORDS=(a '"b\'); COMP_CWORD=1; COMP_LINE='a "b\'; COMP_POINT=5; _get_cword}
+set cmd {COMP_WORDS=(a '"b\'); COMP_CWORD=1; COMP_LINE='a "b\'; COMP_POINT=5; _get_cword; echo}
 assert_bash_list {"\"b\\"} $cmd $test
 
 
@@ -160,7 +160,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
     set expected c
 }
-append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword}
+append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword; echo}
 assert_bash_list $expected $cmd $test
 
 
@@ -173,7 +173,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
 }
-append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword :}
+append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword :; echo}
 assert_bash_list b:c $cmd $test
 
 
@@ -186,7 +186,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
 }
-append cmd {; COMP_LINE='a b c:'; COMP_POINT=6; _get_cword :}
+append cmd {; COMP_LINE='a b c:'; COMP_POINT=6; _get_cword :; echo}
 assert_bash_list c: $cmd $test
 
 
@@ -194,7 +194,7 @@ sync_after_int
 
 
 set test {a :| with WORDBREAKS -= : should return :};  # | = cursor position
-set cmd {COMP_WORDS=(a :); COMP_CWORD=1; COMP_LINE='a :'; COMP_POINT=3; _get_cword :}
+set cmd {COMP_WORDS=(a :); COMP_CWORD=1; COMP_LINE='a :'; COMP_POINT=3; _get_cword :; echo}
 assert_bash_list : $cmd $test
 
 
@@ -207,7 +207,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
 }
-append cmd {; COMP_LINE='a b::'; COMP_POINT=5; _get_cword :}
+append cmd {; COMP_LINE='a b::'; COMP_POINT=5; _get_cword :; echo}
 assert_bash_list b:: $cmd $test
 
 
@@ -217,7 +217,7 @@ sync_after_int
 # This test makes sure `_get_cword' doesn't use `echo' to return it's value,
 # because -n might be interpreted by `echo' and thus will not be returned.
 set test "a -n| should return -n";  # | = cursor position
-set cmd {COMP_WORDS=(a -n); COMP_CWORD=1; COMP_LINE='a -n'; COMP_POINT=4; _get_cword}
+set cmd {COMP_WORDS=(a -n); COMP_CWORD=1; COMP_LINE='a -n'; COMP_POINT=4; _get_cword; echo}
 assert_bash_list -n $cmd $test
 
 
@@ -225,7 +225,7 @@ sync_after_int
 
 
 set test {a b>c| should return c};  # | = cursor position
-set cmd {COMP_WORDS=(a b \> c); COMP_CWORD=3; COMP_LINE='a b>c'; COMP_POINT=5; _get_cword}
+set cmd {COMP_WORDS=(a b \> c); COMP_CWORD=3; COMP_LINE='a b>c'; COMP_POINT=5; _get_cword; echo}
 assert_bash_list c $cmd $test
 
 
@@ -240,7 +240,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
     set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
     set expected c
 }
-append cmd {; COMP_LINE='a b=c'; COMP_POINT=5; _get_cword}
+append cmd {; COMP_LINE='a b=c'; COMP_POINT=5; _get_cword; echo}
 assert_bash_list $expected $cmd $test
 
 
@@ -248,7 +248,7 @@ sync_after_int
 
 
 set test {a *| should return *};  # | = cursor position
-set cmd {COMP_WORDS=(a \*); COMP_CWORD=1; COMP_LINE='a *'; COMP_POINT=4; _get_cword}
+set cmd {COMP_WORDS=(a \*); COMP_CWORD=1; COMP_LINE='a *'; COMP_POINT=4; _get_cword; echo}
 assert_bash_list * $cmd $test
 
 
diff --git a/test/unit/_tilde.exp b/test/unit/_tilde.exp
index 54394cb8..2e22b848 100644
--- a/test/unit/_tilde.exp
+++ b/test/unit/_tilde.exp
@@ -36,7 +36,7 @@ sync_after_int
 
 
 set test "~full should complete to ~full unmodified"
-set cmd [format {_tilde "~%s"; printf "%%s" "${COMPREPLY[@]}"} $full]
+set cmd [format {_tilde "~%s"; printf "%%s\n" "${COMPREPLY[@]}"} $full]
 assert_bash_list "~$full" $cmd $test
 
 
@@ -44,7 +44,7 @@ sync_after_int
 
 
 set test "~part should complete to ~full"
-set cmd [format {_tilde "~%s"; printf "%%s" "${COMPREPLY[@]}"} $part]
+set cmd [format {_tilde "~%s"; printf "%%s\n" "${COMPREPLY[@]}"} $part]
 assert_bash_list "~$full" $cmd $test
 
 

From 42589ab9dc68121c2b943ff5f461849a5cd5eb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 21:54:53 +0200
Subject: [PATCH 183/214] Simplify perldoc _filedir arg.

---
 completions/perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/perl b/completions/perl
index feaeee55..1e34fa3e 100644
--- a/completions/perl
+++ b/completions/perl
@@ -90,7 +90,7 @@ _perldoc()
                 sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
                 awk "\$NF=2 { print \$1}" | command grep perl )' -- "$cur" ) )
         fi
-        _filedir '@(pl|PL|pm|PM|pod|POD)'
+        _filedir 'p@(l|m|od)'
     fi
 }
 complete -F _perldoc -o bashdefault perldoc

From 2f0948083da4392158f313db3f97cc33b7c446ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 21:57:38 +0200
Subject: [PATCH 184/214] Invoke perl module completion with the perl
 executable being completed.

---
 completions/perl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/completions/perl b/completions/perl
index 1e34fa3e..baf8ea8e 100644
--- a/completions/perl
+++ b/completions/perl
@@ -4,7 +4,7 @@ have perl &&
 {
 _perlmodules()
 {
-    COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
+    COMPREPLY=( $( compgen -P "$prefix" -W "$( $1 ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
     __ltrim_colon_completions "$prefix$cur"
 }
 
@@ -41,7 +41,7 @@ _perl()
             return 0
             ;;
         -m|-M)
-            _perlmodules
+            _perlmodules $1
             return 0
             ;;
     esac

From ee1374f70b3abee42ea8848e4ad296a46a0fc1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 22:02:15 +0200
Subject: [PATCH 185/214] Add some perl option non-completions.

---
 completions/perl              | 4 +++-
 test/lib/completions/perl.exp | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/completions/perl b/completions/perl
index baf8ea8e..0862a8cd 100644
--- a/completions/perl
+++ b/completions/perl
@@ -32,8 +32,10 @@ _perl()
         prefix=$prev
     fi
 
-    # only handle module completion for now
     case $prev in
+        -D|-e|-E|-i|-F|-l)
+            return 0
+            ;;
         -I|-x)
             local IFS=$'\n'
             _compopt_o_filenames
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 906433d1..82a95bc1 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -91,6 +91,9 @@ assert_complete $options "perl -"
 
 sync_after_int
 
+assert_no_complete "perl -e "
+sync_after_int
+
 # Assuming that File::Spec and friends are always installed...
 
 assert_complete_any "perl -MFile"

From 43ec91619dd2293bbbfa7bdfd31f748f9686b79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 22:03:28 +0200
Subject: [PATCH 186/214] Add perl -m-/-M- completion.

---
 completions/perl              | 3 +++
 test/lib/completions/perl.exp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/completions/perl b/completions/perl
index 0862a8cd..655ff655 100644
--- a/completions/perl
+++ b/completions/perl
@@ -43,6 +43,9 @@ _perl()
             return 0
             ;;
         -m|-M)
+            temp="${cur#-}"
+            prefix="$prefix${cur%$temp}"
+            cur="$temp"
             _perlmodules $1
             return 0
             ;;
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 82a95bc1..092aab30 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -105,4 +105,10 @@ sync_after_int
 assert_complete_any "perl -MFile::Spec::Func"
 sync_after_int
 
+assert_complete_any "perl -M-File"
+sync_after_int
+
+assert_complete_any "perl -m-File::"
+sync_after_int
+
 teardown

From e9bf8773ecffbd28301e72a0fea4a05d96b29a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 22:04:43 +0200
Subject: [PATCH 187/214] Add perl -V completion.

---
 completions/perl              | 12 ++++++++++++
 test/lib/completions/perl.exp |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/completions/perl b/completions/perl
index 655ff655..4b506fc0 100644
--- a/completions/perl
+++ b/completions/perl
@@ -49,6 +49,18 @@ _perl()
             _perlmodules $1
             return 0
             ;;
+        -V)
+            if [[ $cur == :* ]]; then
+                temp="${cur##+(:)}"
+                prefix="$prefix${cur%$temp}"
+                local IFS=$'\n'
+                COMPREPLY=( $( compgen -P "$prefix" -W \
+                    '$( $1 -MConfig -e "print join \"\\n\",
+                        keys %Config::Config" 2>/dev/null )' -- "$temp" ) )
+                __ltrim_colon_completions "$prefix$temp"
+            fi
+            return 0
+            ;;
     esac
 
     if [[ "$cur" == -* ]]; then
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 092aab30..8cd6f957 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -94,6 +94,12 @@ sync_after_int
 assert_no_complete "perl -e "
 sync_after_int
 
+assert_complete_any "perl -V:install"
+sync_after_int
+
+assert_complete_any "perl -V::install"
+sync_after_int
+
 # Assuming that File::Spec and friends are always installed...
 
 assert_complete_any "perl -MFile"

From 76cf12bc190035740387d4b45e64f53aef5bb4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 22:09:00 +0200
Subject: [PATCH 188/214] Add perl -d: completion.

---
 completions/perl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/completions/perl b/completions/perl
index 4b506fc0..843e249b 100644
--- a/completions/perl
+++ b/completions/perl
@@ -61,6 +61,15 @@ _perl()
             fi
             return 0
             ;;
+        -d|-dt)
+            if [[ $cur == :* ]]; then
+                temp="${cur#:}"
+                prefix="$prefix${cur%$temp}"
+                cur="Devel::$temp"
+                _perlmodules $1
+            fi
+            return 0
+            ;;
     esac
 
     if [[ "$cur" == -* ]]; then

From 96908c87f1ea2fb3b0356a03168aaea365d04902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 19:59:38 +0200
Subject: [PATCH 189/214] Add lsof(8) completion.

---
 CHANGES                       |  2 +-
 completions/Makefile.am       |  1 +
 completions/lsof              | 64 +++++++++++++++++++++++++++++++++++
 test/completion/lsof.exp      |  1 +
 test/lib/completions/lsof.exp | 21 ++++++++++++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 completions/lsof
 create mode 100644 test/completion/lsof.exp
 create mode 100644 test/lib/completions/lsof.exp

diff --git a/CHANGES b/CHANGES
index c53ae2ff..66ec7290 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@ bash-completion (2.x)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, POSIX sh,
+    filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, POSIX sh,
     sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 2071564f..fb423253 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -79,6 +79,7 @@ bashcomp_DATA = abook \
 		lintian \
 		lisp \
 		lrzip \
+		lsof \
 		lvm \
 		lzma \
 		lzop \
diff --git a/completions/lsof b/completions/lsof
new file mode 100644
index 00000000..ac010dad
--- /dev/null
+++ b/completions/lsof
@@ -0,0 +1,64 @@
+# lsof(8) completion
+
+have lsof &&
+_lsof()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -'?'|-h|+c|-c|-d|-F|-i|+r|-r|-s|-S|-T)
+            return 0
+            ;;
+        -A|-k|-m|+m|-o)
+            _filedir
+            return 0
+            ;;
+        +d|+D)
+            _filedir -d
+            return 0
+            ;;
+        -D)
+            COMPREPLY=( $( compgen -W '? b i r u' -- "$cur" ) )
+            return 0
+            ;;
+        -f)
+            COMPREPLY=( $( compgen -W 'c f g G n' -- "$cur" ) )
+            return 0
+            ;;
+        -g)
+            # TODO: handle ^foo exclusions, comma separated lists
+            _pgids
+            return 0
+            ;;
+        -p)
+            # TODO: handle ^foo exclusions, comma separated lists
+            _pids
+            return 0
+            ;;
+        -u)
+            # TODO: handle ^foo exclusions, comma separated lists
+            COMPREPLY=( $( compgen -u -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == [-+]* ]]; then
+        COMPREPLY=( $( compgen -W '-h -a -A -b -c +c -C +d -d +D -D +f -f -F -g
+            -i -k -l +L -L +m -m +M -M -n -N -o -O -p -P +r -r -R -s -S -T -t
+            -u -U -v -V +w -w -x -X -z -Z' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _lsof lsof
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/lsof.exp b/test/completion/lsof.exp
new file mode 100644
index 00000000..98baab04
--- /dev/null
+++ b/test/completion/lsof.exp
@@ -0,0 +1 @@
+assert_source_completions lsof
diff --git a/test/lib/completions/lsof.exp b/test/lib/completions/lsof.exp
new file mode 100644
index 00000000..551bde2a
--- /dev/null
+++ b/test/lib/completions/lsof.exp
@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "lsof "
+sync_after_int
+
+assert_complete_any "lsof -"
+sync_after_int
+
+
+teardown

From 7df38d3c5dc5848b50de8538fe6b70a2d35fa2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:00:34 +0200
Subject: [PATCH 190/214] Indentation fixes.

---
 completions/python | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/completions/python b/completions/python
index 54a99da1..449bceff 100644
--- a/completions/python
+++ b/completions/python
@@ -9,22 +9,22 @@ _python()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-    -Q)
-        COMPREPLY=( $( compgen -W "old new warn warnall" -- "$cur" ) )
-        return 0
-        ;;
-    -W)
-        COMPREPLY=( $( compgen -W "ignore default all module once error" \
-            -- "$cur" ) )
-        return 0
-        ;;
-    -c)
-        _filedir '@(py|pyc|pyo)'
-        return 0
-        ;;
-    !(python|-?))
-        [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
-        ;;
+        -Q)
+            COMPREPLY=( $( compgen -W "old new warn warnall" -- "$cur" ) )
+            return 0
+            ;;
+        -W)
+            COMPREPLY=( $( compgen -W "ignore default all module once error" \
+                -- "$cur" ) )
+            return 0
+            ;;
+        -c)
+            _filedir '@(py|pyc|pyo)'
+            return 0
+            ;;
+        !(python|-?))
+            [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
+            ;;
     esac
 
 

From d1be965eeed3d865f8b54c1ebe8fe9c8398192de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:02:12 +0200
Subject: [PATCH 191/214] Install python completion for python2 and python3
 too.

---
 CHANGES            | 4 ++--
 completions/python | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 66ec7290..50d72564 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,8 +15,8 @@ bash-completion (2.x)
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
   * Improve /etc/init.d/*, ipmitool, jar, javadoc, man, mencoder, mkdir,
-    mplayer, povray, rpmbuild, sqlite3, tar, wodim, and general help parsing
-    completions.
+    mplayer, povray, python, rpmbuild, sqlite3, tar, wodim, and general help
+    parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
   * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
   * Recognize rpm query mode based on the --file, --group, --package, and
diff --git a/completions/python b/completions/python
index 449bceff..ad272707 100644
--- a/completions/python
+++ b/completions/python
@@ -22,7 +22,7 @@ _python()
             _filedir '@(py|pyc|pyo)'
             return 0
             ;;
-        !(python|-?))
+        !(python?([23])|-?))
             [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
             ;;
     esac
@@ -45,7 +45,7 @@ _python()
 
     return 0
 } &&
-complete -F _python python
+complete -F _python python python2 python3
 
 # Local variables:
 # mode: shell-script

From 4b2c511e2d9bfd7d9ec5c6956bb6f195ec03568f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:05:06 +0200
Subject: [PATCH 192/214] Get python options with _parse_help().

---
 completions/python              | 3 +--
 test/lib/completions/python.exp | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/completions/python b/completions/python
index ad272707..68b55ff9 100644
--- a/completions/python
+++ b/completions/python
@@ -39,8 +39,7 @@ _python()
     if [[ "$cur" != -* ]]; then
         _filedir '@(py|pyc|pyo)'
     else
-        COMPREPLY=( $( compgen -W "- -d -E -h -i -O -Q -S -t -u \
-            -U -v -V -W -x -c" -- "$cur" ) )
+        COMPREPLY=( $( compgen -W "$( _parse_help $1 -h )" -- "$cur" ) )
     fi
 
     return 0
diff --git a/test/lib/completions/python.exp b/test/lib/completions/python.exp
index 57520cdf..446e3d09 100644
--- a/test/lib/completions/python.exp
+++ b/test/lib/completions/python.exp
@@ -12,8 +12,9 @@ setup
 
 
 assert_complete_any "python "
+sync_after_int
 
-
+assert_complete_any "python -"
 sync_after_int
 
 

From d5a7346390acb4872f1c258f82b5cd5ef3bdf79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:30:42 +0200
Subject: [PATCH 193/214] Add some python option arg non-completions.

---
 completions/python | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/completions/python b/completions/python
index 68b55ff9..3b8aba6f 100644
--- a/completions/python
+++ b/completions/python
@@ -9,6 +9,9 @@ _python()
     _get_comp_words_by_ref cur prev
 
     case $prev in
+        -'?'|-h|--help|-V|--version|-m)
+            return 0
+            ;;
         -Q)
             COMPREPLY=( $( compgen -W "old new warn warnall" -- "$cur" ) )
             return 0

From fdae59d057ae5887a8730358683ac1ba206cf55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:35:25 +0200
Subject: [PATCH 194/214] Simplify python _filedir glob.

---
 completions/python | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/python b/completions/python
index 3b8aba6f..7c8fbba2 100644
--- a/completions/python
+++ b/completions/python
@@ -40,7 +40,7 @@ _python()
 
 
     if [[ "$cur" != -* ]]; then
-        _filedir '@(py|pyc|pyo)'
+        _filedir 'py?([co])'
     else
         COMPREPLY=( $( compgen -W "$( _parse_help $1 -h )" -- "$cur" ) )
     fi

From c1d3cdad70523552e63688cb053a960b64e97b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 21 Nov 2010 20:36:09 +0200
Subject: [PATCH 195/214] python -c takes a command, not a script.

---
 completions/python | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/completions/python b/completions/python
index 7c8fbba2..d6274298 100644
--- a/completions/python
+++ b/completions/python
@@ -9,7 +9,7 @@ _python()
     _get_comp_words_by_ref cur prev
 
     case $prev in
-        -'?'|-h|--help|-V|--version|-m)
+        -'?'|-h|--help|-V|--version|-c|-m)
             return 0
             ;;
         -Q)
@@ -21,10 +21,6 @@ _python()
                 -- "$cur" ) )
             return 0
             ;;
-        -c)
-            _filedir '@(py|pyc|pyo)'
-            return 0
-            ;;
         !(python?([23])|-?))
             [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
             ;;

From 5a38f828d4300af46e8c183c87c19c9001566f42 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Mon, 22 Nov 2010 22:57:00 +0100
Subject: [PATCH 196/214] (testsuite) Split assert_complete() into
 assert_complete_many() and assert_complete_one(). Fix ssh completion now that
 match_items() also matches on prompt.

---
 test/lib/completions/cd.exp    |   2 +-
 test/lib/completions/mount.exp |   4 +-
 test/lib/completions/ssh.exp   |   8 +-
 test/lib/library.exp           | 308 +++++++++++++++++++++------------
 4 files changed, 206 insertions(+), 116 deletions(-)

diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 1361b3c6..55bae158 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -40,7 +40,7 @@ set test "Tab should complete CDPATH"
 assert_bash_exec "declare -p CDPATH &>/dev/null && OLDCDPATH=\$CDPATH || :"
 assert_bash_exec "CDPATH=\$PWD";
 assert_complete "$::srcdir/fixtures/shared/default/foo.d/" \
-    "cd $::srcdir/fixtures/shared/default/fo" $test -nospace
+    "cd $::srcdir/fixtures/shared/default/fo" $test -nospace -expect-cmd-minus fo
 sync_after_int
     # Reset CDPATH
 assert_bash_exec "declare -p OLDCDPATH &>/dev/null && CDPATH=\$OLDCDPATH || unset CDPATH && unset OLDCDPATH"
diff --git a/test/lib/completions/mount.exp b/test/lib/completions/mount.exp
index bab720b0..c99d6058 100644
--- a/test/lib/completions/mount.exp
+++ b/test/lib/completions/mount.exp
@@ -54,7 +54,7 @@ set expected [list /test/path /test/path2 /second/path]
 set cmd "mount mocksrv:/"
 assert_bash_exec {OLDPATH="$PATH"; PATH="$SRCDIRABS/fixtures/mount/bin:$PATH";}
 # This needs an explicit cword param or will output "unresolved".
-assert_complete $expected $cmd $test "/@" 20 "/"
+assert_complete $expected $cmd $test -expect-cmd-minus /
 sync_after_int
 assert_bash_exec {PATH="$OLDPATH"; unset -v OLDPATH}
 
@@ -93,7 +93,7 @@ assert_complete {/mnt/nice\ test\\path} {mnt /mnt/nice\ test\\p}
 sync_after_int
 
 assert_complete {{/mnt/nice\ test\\path} {/mnt/nice\ test-path}} \
-    {mnt /mnt/nice\ } "" /@ 20 {/mnt/nice\ }
+    {mnt /mnt/nice\ } "" -expect-cmd-minus {/mnt/nice\ }
 sync_after_int
 
 assert_complete {/mnt/nice\$test-path} {mnt /mnt/nice\$}
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index 217fa2c3..1599dccc 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -29,7 +29,6 @@ expect {
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
 }
-sync_after_int
 
 
 sync_after_int
@@ -61,15 +60,16 @@ sync_after_int
 
 
 set test "First argument should complete partial hostname"
-assert_complete_partial [get_hosts] ssh "" $test \
-    -filters "ltrim_colon_completions"
+assert_complete_partial [get_hosts] ssh "" $test -ltrim-colon-completions
 
 
 sync_after_int
 
 
 set test "-F should complete filename"
-assert_complete "-Fspaced\\ \\ conf" "ssh -Fsp" "-F should complete filename"
+assert_complete "-Fspaced\\ \\ conf" "ssh -Fsp" $test
+
+
 sync_after_int
 
 
diff --git a/test/lib/library.exp b/test/lib/library.exp
index ace83dc9..4ac88005 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -1,6 +1,6 @@
-    # Source `init.tcl' again to restore the `unknown' procedure
-    # NOTE: DejaGnu has an old `unknown' procedure which unfortunately disables
-    #       tcl auto-loading.
+# Source `init.tcl' again to restore the `unknown' procedure
+# NOTE: DejaGnu has an old `unknown' procedure which unfortunately disables
+#       tcl auto-loading.
 source [file join [info library] init.tcl]
 package require cmdline
 package require textutil::string
@@ -133,133 +133,201 @@ proc assert_bash_list_dir {expected cmd dir test {args {}}} {
 
 
 # Make sure the expected items are returned by TAB-completing the specified
-# command.
+# command.  If the number of expected items is one, expected is:
+#
+#     $cmd<TAB>$expected[<SPACE>]
+#
+# SPACE is not expected if -nospace is specified.
+#
+# If the number of expected items is greater than one, expected is:
+#
+#     $cmd<TAB>\n
+#     $expected\n
+#     $prompt + ($cmd - AUTO) + longest-common-prefix-of-$expected
+#
+# AUTO is calculated like this: If $cmd ends with non-whitespace, and
+# the last argument of $cmd equals the longest-common-prefix of
+# $expected, $cmd minus this argument will be expected.
+#
+# If the algorithm above fails, you can manually specify the CWORD to be
+# subtracted from $cmd specifying `-expect-cmd-minus CWORD'.  Known cases where
+# this is useful are when:
+# - the last whitespace is escaped, e.g. "finger foo\ " or "finger
+#   'foo "
+#
+# If the entire $cmd is expected, specify `-expect-cmd-full'.
+#
 # @param list $expected  Expected completions.
 # @param string $cmd  Command given to generate items
 # @param string $test  Test title
 # @param list $args  Options:
-#     -prompt PROMPT  Bash prompt.  Default is `/@'
+#     -prompt PROMPT   Bash prompt.  Default is `/@'
 #     -chunk-size CHUNK-SIZE   Compare list CHUNK-SIZE items at
 #         a time.  Default is 20.
-#     -cword CWORD  Last argument of $cmd which is an argument-to-complete and
-#         to be replaced with the longest common prefix of $expected.  If empty
-#         string (default), `assert_complete' autodetects if the last argument
-#         is an argument-to-complete by checking if $cmd doesn't end with
-#         whitespace.  Specifying `cword' should only be necessary if this
-#         autodetection fails, e.g.  when the last whitespace is escaped or
-#         quoted, e.g. "finger foo\ " or "finger 'foo "
-#     -nospace  Don't expect space character to be output after completion match.
-#     -filters  List of filters to apply to this function to tweak the expected
-#         completions and argument-to-complete.  Possible values:
-#         - "ltrim_colon_completions"
-#proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {filters ""}} {
-# @result boolean  True if successful, False if not
+#     -nospace   Don't expect space character to be output after completion match.
+#         Valid only if a single completion is expected.
+#     -ltrim-colon-completions   Left-trim completions with cword containing
+#         colon (:)
+#     -expect-cmd-full   Expect the full $cmd to be echoed.  Expected is:
+#
+#             $cmd<TAB>\n
+#             $expected\n
+#             $prompt + $cmd + longest-common-prefix-of-$expected
+#
+#     -expect-cmd-minus DWORD   Expect $cmd minus DWORD to be echoed.
+#         Expected is:
+#
+#             $cmd<TAB>\n
+#             $expected\n
+#             $prompt + ($cmd - DWORD) + longest-common-prefix-of-$expected
+#
 proc assert_complete {expected cmd {test ""} {args {}}} {
+    set args_orig $args
     array set arg [::cmdline::getoptions args {
         {prompt.arg     "/@" "bash prompt"}
         {chunk-size.arg 20   "compare N list items at a time"}
-        {cword.arg      ""   "word to complete"}
         {nospace             "don't expect space after completion"}
-        {filters.arg    ""   "filters to preprocess expected completions"}
+        {ltrim-colon-completions  "left-trim completions with cword containing :"}
+        {expect-cmd-full          "Expect full cmd after prompt"}
+        {expect-cmd-minus.arg ""  "Expect cmd minus DWORD after prompt"}
     }]
-    set cword $arg(cword)
-    set prompt $arg(prompt)
     if {[llength $expected] == 0} {
         assert_no_complete $cmd $test
+    } elseif {[llength $expected] == 1} {
+        eval assert_complete_one \$expected \$cmd \$test $args_orig
     } else {
-        if {$test == ""} {set test "$cmd should show completions"}
-        send "$cmd\t"
-        if {[llength $expected] == 1} {
-            expect -ex "$cmd"
-
-            if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] == -1} {
-                set cur "";  # Default to empty word to complete on
-                set words [split_words_bash $cmd]
-                if {[llength $words] > 1} {
-                        # Assume last word of `$cmd' is word to complete on.
-                    set index [expr [llength $words] - 1]
-                    set cur [lindex $words $index]
-                }
-                    # Remove second word from beginning of single item $expected
-                if {[string first $cur $expected] == 0} {
-                    set expected [list [string range $expected [string length $cur] end]]
-                }
-            }
-        } else {
-            expect -ex "$cmd\r\n"
-            # Make sure expected items are unique
-            set expected [lsort -unique $expected]
-        }
-
-        if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] != -1} {
-                # If partial contains colon (:), remove partial from begin of items
-                # See also: bash_completion.__ltrim_colon_completions()
-            _ltrim_colon_completions cword expected
-        }
-
-        if {$arg(nospace)} {set endspace ""} else {set endspace "-end-space"}
-        if {[
-            eval match_items \$expected -bash-sort -chunk-size \
-                \$arg(chunk-size) $endspace -prompt \$prompt
-        ]} {
-            if {[llength $expected] == 1} {
-                pass "$test"
-            } else {
-                # Remove optional (partial) last argument-to-complete from `cmd',
-                # E.g. "finger test@" becomes "finger"
-
-                if {[lsearch -exact $arg(filters) "ltrim_colon_completions"] != -1} {
-                    set cmd2 $cmd
-                } else {
-                    set cmd2 [_remove_cword_from_cmd $cmd $cword]
-                }
-
-                # Determine common prefix of completions
-                set common [::textutil::string::longestCommonPrefixList $expected]
-                #if {[string length $common] > 0} {set common " $common"}
-                expect {
-                    -ex "$prompt$cmd2$common" { pass "$test" }
-                    -re $prompt { unresolved "$test at prompt" }
-                    -re eof { unresolved "eof" }
-                }
-            }
-        } else {
-            fail "$test"
-        }
+        eval assert_complete_many \$expected \$cmd \$test $args_orig
     }
 }
 
 
-# @param string $cmd  Command to remove cword from
-# @param string $cword  (optional) Last argument of $cmd which is an
-#     argument-to-complete and to be deleted.  If empty string (default),
-#     `_remove_cword_from_cmd' autodetects if the last argument is an
-#     argument-to-complete by checking if $cmd doesn't end with whitespace.
-#     Specifying `cword' is only necessary if this autodetection fails, e.g.
+# Make sure the expected multiple items are returned by TAB-completing the
+# specified command.
+# @see assert_complete()
+proc assert_complete_many {expected cmd {test ""} {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {prompt.arg     "/@" "bash prompt"}
+        {chunk-size.arg 20   "compare N list items at a time"}
+        {nospace             "don't expect space after completion"}
+        {ltrim-colon-completions  "left-trim completions with cword containing :"}
+        {expect-cmd-full          "Expect full cmd after prompt"}
+        {expect-cmd-minus.arg ""  "Expect cmd minus CWORD after prompt"}
+    }]
+    if {$test == ""} {set test "$cmd should show completions"}
+    set prompt $arg(prompt)
+    set dword ""
+    if {$arg(expect-cmd-minus) != ""} {set dword $arg(expect-cmd-minus)}
+
+    send "$cmd\t"
+    expect -ex "$cmd\r\n"
+
+    # Make sure expected items are unique
+    set expected [lsort -unique $expected]
+
+    # Determine common prefix of completions
+    set common [::textutil::string::longestCommonPrefixList $expected]
+
+    if {$arg(ltrim-colon-completions)} {
+        # If partial contains colon (:), remove partial from begin of items
+        _ltrim_colon_completions $cmd expected dword
+    }
+    set cmd2 [_remove_cword_from_cmd $cmd $dword $common]
+
+    set prompt "$prompt$cmd2$common"
+    if {$arg(nospace)} {set endspace ""} else {set endspace "-end-space"}
+    set endprompt "-end-prompt"
+    if {[
+        eval match_items \$expected -bash-sort -chunk-size \
+            \$arg(chunk-size) $endprompt $endspace -prompt \$prompt
+    ]} {
+        pass "$test"
+    } else {
+        fail "$test"
+    }
+}
+
+
+# Make sure the expected single item is returned by TAB-completing the
+# specified command.
+# @see assert_complete()
+proc assert_complete_one {expected cmd {test ""} {args {}}} {
+    array set arg [::cmdline::getoptions args {
+        {prompt.arg     "/@" "bash prompt"}
+        {chunk-size.arg 20   "compare N list items at a time"}
+        {nospace             "don't expect space after completion"}
+        {ltrim_colon_completions  "left-trim completions with cword containing :"}
+        {expect-cmd-full          "Expect full cmd after prompt"}
+        {expect-cmd-minus.arg ""  "Expect cmd minus CWORD after prompt"}
+    }]
+    set prompt $arg(prompt)
+
+    if {$test == ""} {set test "$cmd should show completion"}
+    send "$cmd\t"
+    expect -ex "$cmd"
+    if {$arg(ltrim_colon_completions)} {
+        # If partial contains colon (:), remove partial from begin of items
+        _ltrim_colon_completions cword expected
+    } else {
+        set cur "";  # Default to empty word to complete on
+        set words [split_words_bash $cmd]
+        if {[llength $words] > 1} {
+            # Assume last word of `$cmd' is word to complete on.
+            set index [expr [llength $words] - 1]
+            set cur [lindex $words $index]
+        }
+        # Remove second word from beginning of $expected
+        if {[string first $cur $expected] == 0} {
+            set expected [list [string range $expected [string length $cur] end]]
+        }
+    }
+
+    if {$arg(nospace)} {set endspace ""} else {set endspace "-end-space"}
+    if {[
+        eval match_items \$expected -bash-sort -chunk-size \
+            \$arg(chunk-size) $endspace -prompt \$prompt
+    ]} {
+        pass "$test"
+    } else {
+        fail "$test"
+    }
+}
+
+
+# @param string $cmd  Command to remove current-word-to-complete from.
+# @param string $dword  (optional) Manually specify current-word-to-complete,
+#     i.e. word to remove from $cmd.  If empty string (default),
+#     `_remove_cword_from_cmd' autodetects if the last argument is the
+#     current-word-to-complete by checking if $cmd doesn't end with whitespace.
+#     Specifying `dword' is only necessary if this autodetection fails, e.g.
 #     when the last whitespace is escaped or quoted, e.g. "finger foo\ " or
 #     "finger 'foo "
-# @return string  Command with cword removed
-proc _remove_cword_from_cmd {cmd {cword ""}} {
+# @param string $common  (optional) Common prefix of expected completions.
+# @return string  Command with current-word-to-complete removed
+proc _remove_cword_from_cmd {cmd {dword ""} {common ""}} {
     set cmd2 $cmd
-    # Is $cword specified?
-    if {[string length $cword] > 0} {
-        # Remove $cword from end of $cmd
-        if {[string last $cword $cmd] == [string length $cmd] - [string length $cword]} {
-            set cmd2 [string range $cmd 0 [expr [string last $cword $cmd] - 1]]
+    # Is $dword specified?
+    if {[string length $dword] > 0} {
+        # Remove $dword from end of $cmd
+        if {[string last $dword $cmd] == [string length $cmd] - [string length $dword]} {
+            set cmd2 [string range $cmd 0 [expr [string last $dword $cmd] - 1]]
         }
     } else {
-        # No, $cword not specified;
-        # Check if last argument is really an-argument-to-complete, i.e.
+        # No, $dword not specified;
+        # Check if last argument is really a word-to-complete, i.e.
         # doesn't end with whitespace.
         # NOTE: This check fails if trailing whitespace is escaped or quoted,
         #       e.g. "finger foo\ " or "finger 'foo ".  Specify parameter
-        #       $cword in those cases.
+        #       $dword in those cases.
         # Is last char whitespace?
         if {! [string is space [string range $cmd end end]]} {
             # No, last char isn't whitespace;
-            # Remove argument-to-complete from end of $cmd
-            set cmd2 [lrange [split $cmd] 0 end-1]
-            append cmd2 " "
+            set cmds [split $cmd]
+            # Does word-to-complete start with $common?
+            if {[string first $common [lrange $cmds end end]] == 0} {
+                # Remove word-to-complete from end of $cmd
+                set cmd2 [lrange $cmds 0 end-1]
+                append cmd2 " "
+            }
         }
     }
     return $cmd2
@@ -337,37 +405,52 @@ proc assert_complete_partial {expected cmd {partial ""} {test ""} {args {}}} {
         set expected [lsort -unique $expected]
         foreach item $expected {
             if {$partial == ""} {set partial [string range $item 0 0]}
-                # Only append item if starting with $partial
+            # Only append item if starting with $partial
             if {[string range $item 0 [expr [string length $partial] - 1]] == "$partial"} {
                 lappend pick $item
             }
         }
-        assert_complete $pick "$cmd $partial" $test $args
+        # NOTE: The `eval' is necessary to flatten the $args list
+        #       See also: http://wiki.tcl.tk/11787 - {expand}
+        eval assert_complete \$pick \"\$cmd \$partial\" \$test $args; #"
     }
 }
 
 
+# If cword contains colon (:), left-trim completions with cword
+# @param string $cmd  Command to complete 
+# @param list $items  Reference to list of completions to trim
+# @param string $dword   Reference to variable to contain word to remove from
+#                        expected cmd.
 # See also: bash_completion._ltrim_colon_completions
-proc _ltrim_colon_completions {cword items} {
-    upvar 1 $cword cword_out
+proc _ltrim_colon_completions {cmd items dword} {
     upvar 1 $items items_out
+    upvar 1 $dword dword_out
+
+    set cur "";  # Default to empty word to complete on
+    set words [split_words_bash $cmd]
+    if {[llength $words] > 1} {
+        # Assume last word of `$cmd' is word to complete on.
+        set index [expr [llength $words] - 1]
+        set cur [lindex $words $index]
+    }
     # If word-to-complete contains a colon,
     # and bash-version < 4,
     # or bash-version >= 4 and COMP_WORDBREAKS contains a colon
     if {
-        [string first : $cword_out] > -1 && (
+        [string first : $cur] > -1 && (
             [lindex $::BASH_VERSINFO 0] < 4 ||
             ([lindex $::BASH_VERSINFO 0] >= 4 && [string first ":" $::COMP_WORDBREAKS] > -1)
         )
     } {
+        set dword_out $cur
         for {set i 0} {$i < [llength $items_out]} {incr i} {
             set item [lindex $items_out $i]
-            if {[string first $cword_out $item] == 0} {
+            if {[string first $cur $item] == 0} {
                 # Strip colon-prefix
-                lset items_out $i [string range $item [string length $cword_out] end]
+                lset items_out $i [string range $item [string length $cur] end]
             }
         }
-        #set cword_out ""
     }
 }
 
@@ -694,8 +777,15 @@ proc match_items {items {args {}}} {
                 timeout { set result false; break }
             }
         } else {
+            set end ""
+            if {$arg(end-prompt) && $i + $j == [llength $items]} {
+                set end "$prompt"
+                _escape_regexp_chars end
+                # \$ matches real end of expect_out buffer
+                set end "$end\$"
+            }
             expect {
-                -re "^$expected" { set result true }
+                -re "^$expected$end" { set result true }
                 default { set result false; break }
                 timeout { set result false; break }
             }

From a0e7299717b1622f8ee1727ce111e6d7e1d5d795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 23 Nov 2010 09:17:53 +0200
Subject: [PATCH 197/214] (testsuite) assert_complete_one() fixes, revealed by
 ssh.exp.

---
 test/lib/library.exp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lib/library.exp b/test/lib/library.exp
index 4ac88005..61b3f409 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -255,7 +255,7 @@ proc assert_complete_one {expected cmd {test ""} {args {}}} {
         {prompt.arg     "/@" "bash prompt"}
         {chunk-size.arg 20   "compare N list items at a time"}
         {nospace             "don't expect space after completion"}
-        {ltrim_colon_completions  "left-trim completions with cword containing :"}
+        {ltrim-colon-completions  "left-trim completions with cword containing :"}
         {expect-cmd-full          "Expect full cmd after prompt"}
         {expect-cmd-minus.arg ""  "Expect cmd minus CWORD after prompt"}
     }]
@@ -264,9 +264,9 @@ proc assert_complete_one {expected cmd {test ""} {args {}}} {
     if {$test == ""} {set test "$cmd should show completion"}
     send "$cmd\t"
     expect -ex "$cmd"
-    if {$arg(ltrim_colon_completions)} {
+    if {$arg(ltrim-colon-completions)} {
         # If partial contains colon (:), remove partial from begin of items
-        _ltrim_colon_completions cword expected
+        _ltrim_colon_completions $cmd expected cword
     } else {
         set cur "";  # Default to empty word to complete on
         set words [split_words_bash $cmd]

From c81b87fbd3e1c21eeae70f4f19bea85b948a8696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 4 Dec 2010 21:05:54 +0200
Subject: [PATCH 198/214] Make _command_offset() do the right thing with full
 path completions.

For example, "sudo /usr/sbin/useradd" completion didn't work properly,
whereas "sudo useradd" did.
---
 bash_completion | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bash_completion b/bash_completion
index d9e1b66a..44137c25 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1495,8 +1495,8 @@ _command_offset()
         COMPREPLY=( $( compgen -c -- "$cur" ) )
     else
         cmd=${COMP_WORDS[0]}
-        if complete -p $cmd &>/dev/null; then
-            cspec=$( complete -p $cmd )
+        if complete -p ${cmd##*/} &>/dev/null; then
+            cspec=$( complete -p ${cmd##*/} )
             if [ "${cspec#* -F }" != "$cspec" ]; then
                 # complete -F <function>
 
@@ -1522,7 +1522,7 @@ _command_offset()
                 fi
             elif [ -n "$cspec" ]; then
                 cspec=${cspec#complete};
-                cspec=${cspec%%$cmd};
+                cspec=${cspec%%${cmd##*/}};
                 COMPREPLY=( $( eval compgen "$cspec" -- "$cur" ) );
             fi
         fi

From 6e12e1a2aafbcff5d0a4fd22ddf16821a21b8e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 9 Dec 2010 22:58:01 +0200
Subject: [PATCH 199/214] Add *.gz versions of supported filenames to xmllint
 filename completions.

---
 CHANGES             |  3 ++-
 completions/xmllint | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 50d72564..47621470 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,7 +18,8 @@ bash-completion (2.x)
     mplayer, povray, python, rpmbuild, sqlite3, tar, wodim, and general help
     parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
-  * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions.
+  * Add *.xsd, *.xsl, *.rng, and *.wsdl to xmllint filename completions,
+    and *.gz versions of all of the supported ones.
   * Recognize rpm query mode based on the --file, --group, --package, and
     --all long options (RedHat: #630328).
   * Improve rpm query option completions.
diff --git a/completions/xmllint b/completions/xmllint
index 27ba61e0..bed3b42d 100644
--- a/completions/xmllint
+++ b/completions/xmllint
@@ -18,19 +18,19 @@ _xmllint()
             return 0
             ;;
         --dtdvalid)
-            _filedir dtd
+            _filedir 'dtd?(.gz)'
             return 0
             ;;
         --relaxng)
-            _filedir rng
+            _filedir 'rng?(.gz)'
             return 0
             ;;
         --schema)
-            _filedir xsd
+            _filedir 'xsd?(.gz)'
             return 0
             ;;
         --schematron)
-            _filedir sch
+            _filedir 'sch?(.gz)'
             return 0
             ;;
     esac
@@ -42,7 +42,7 @@ _xmllint()
         return 0
     fi
 
-    _filedir '@(*ml|htm|svg|xs[dl]|rng|wsdl)'
+    _filedir '@(*ml|htm|svg|xs[dl]|rng|wsdl)?(.gz)'
 } &&
 complete -F _xmllint xmllint
 

From 70d5ff09e04886e33998def5eebbdec84dae230a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 11 Dec 2010 12:56:52 +0200
Subject: [PATCH 200/214] Add *.spkg (Sage Package) to tar filename
 completions.

---
 CHANGES         |  2 +-
 completions/tar | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 47621470..4a27d45f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,7 +31,7 @@ bash-completion (2.x)
   * Add *.iso (Alioth: #311420), *.m2t and *.m2ts (Alioth: #312770) to
     xine-based player filename completions.
   * Add /etc/ethers to MAC address completion sources.
-  * Add *.gem to tar completions.
+  * Add *.gem and *.spkg to tar filename completions.
   * Complete known hosts from avahi-browse only if $COMP_KNOWN_HOSTS_WITH_AVAHI
     is non-empty (Alioth: #312691, RedHat: #630326).
   * Improve relevance of many user/group completions, depending on context.
diff --git a/completions/tar b/completions/tar
index fba25d61..a5c02490 100644
--- a/completions/tar
+++ b/completions/tar
@@ -19,20 +19,20 @@ _tar()
             return 0
             ;;
         +([^IZzJjy])f)
-            ext='@(@(tar|gem)?(.@(Z|[gx]z|bz?(2)|lzma))|t@([glx]z|bz?(2)))'
-            regex='\(\(tar\|gem\)\(\.\(Z\|[gx]z\|bz?(2)\|lzma\)\)\?\|t\([glx]z\|bz2\?\)\)'
+            ext='@(@(tar|gem|spkg)?(.@(Z|[gx]z|bz?(2)|lzma))|t@([glx]z|bz?(2)))'
+            regex='\(\(tar\|gem\|spkg\)\(\.\(Z\|[gx]z\|bz?(2)\|lzma\)\)\?\|t\([glx]z\|bz2\?\)\)'
             ;;
         *[Zz]*f)
-            ext='@(t?(ar.)|gem.)@(gz|Z)'
-            regex='\(t\(ar\.\)\?\|gem\.\)\(gz\|Z\)'
+            ext='@(t?(ar.)|gem.|spkg.)@(gz|Z)'
+            regex='\(t\(ar\.\)\?\|gem\.\|spkg\.\)\(gz\|Z\)'
             ;;
         *[Ijy]*f)
-            ext='@(t?(ar.)|gem.)bz?(2)'
-            regex='\(t\(ar\.\)\?\|gem\.\)bz2\?'
+            ext='@(@(t?(ar.)|gem.)bz?(2)|spkg)'
+            regex='\(\(t\(ar\.\)\?\|gem\.\)bz2\?\|spkg\)'
             ;;
         *[J]*f)
-            ext='@(t?(ar.)|gem.)@(lz?(ma)|xz)'
-            regex='\(t\(ar\.\)\?\|gem\.\)\(lzma\|xz\)\?'
+            ext='@(t?(ar.)|gem.|spkg.)@(lz?(ma)|xz)'
+            regex='\(t\(ar\.\)\?\|gem\.\|spkg\.\)\(lzma\|xz\)\?'
             ;;
         *)
             _filedir

From c5957792abbfa51ebebd312b2345dfab7d37b62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 13 Dec 2010 21:30:38 +0200
Subject: [PATCH 201/214] Turn on -o filenames in _command_offset() for
 completions that specify it.

We don't need to do "complete -o filenames ..." when installing
bash-completion completions any longer (they should be handled
"internally"), but there are external completions which do that and
need it in effect also when completing with nice, sudo and friends.
---
 bash_completion | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bash_completion b/bash_completion
index 44137c25..e724f02e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1518,6 +1518,8 @@ _command_offset()
                     cspec=${cspec%% *}
                     if [[ "$cspec" != @(dir|file)names ]]; then
                         COMPREPLY=("${COMPREPLY[@]//\\\\:/:}")
+                    else
+                        _compopt_o_filenames
                     fi
                 fi
             elif [ -n "$cspec" ]; then

From 0ceca807c50f9cec823999e497f6842c3f16e6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 16 Dec 2010 19:59:41 +0200
Subject: [PATCH 202/214] Add *.apk to unzip and jar filename completions.

---
 CHANGES         | 1 +
 bash_completion | 2 +-
 completions/jar | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4a27d45f..51489daf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ bash-completion (2.x)
   * Remove most "-o filenames" options to "complete", turn "-o filenames" on
     dynamically when needed instead.
   * Add/improve various autotools completions.
+  * Add *.apk to unzip and jar filename completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index e724f02e..e4787f20 100644
--- a/bash_completion
+++ b/bash_completion
@@ -70,7 +70,7 @@ complete -d pushd
 # START exclude -- do NOT remove this line
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
 complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
-complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub)' unzip zipinfo
+complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub|apk)' unzip zipinfo
 complete -f -X '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
 complete -f -X '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
diff --git a/completions/jar b/completions/jar
index f60eb3ef..d703019d 100644
--- a/completions/jar
+++ b/completions/jar
@@ -18,7 +18,7 @@ _jar()
             _filedir
             ;;
         *f)
-            _filedir '@([ejw]ar|zip)'
+            _filedir '@([ejw]ar|zip|apk)'
             ;;
         *)
             _filedir

From 1110fcadb18b86234763309b5bf6927f1deb480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Dec 2010 12:56:28 +0200
Subject: [PATCH 203/214] Do not load bash_completion in profile.d script if
 progcomp is not enabled.

---
 CHANGES               | 1 +
 bash_completion.sh.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 51489daf..6f43f657 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,7 @@ bash-completion (2.x)
     dynamically when needed instead.
   * Add/improve various autotools completions.
   * Add *.apk to unzip and jar filename completions.
+  * Do not load bash_completion in profile.d script if progcomp is not enabled.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion.sh.in b/bash_completion.sh.in
index bdddeee0..f6a983fb 100644
--- a/bash_completion.sh.in
+++ b/bash_completion.sh.in
@@ -4,7 +4,7 @@
 # Check for recent enough version of bash.
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-    if [ -r @sysconfdir@/bash_completion ]; then
+    if shopt -q progcomp && [ -r @sysconfdir@/bash_completion ]; then
         # Source completion code.
         . @sysconfdir@/bash_completion
     fi

From c55dfe6982983cfd15c4184198301aa3476ae343 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Sat, 18 Dec 2010 23:23:59 +0100
Subject: [PATCH 204/214] Complete on all files for mplayer's -dvd-device.

  This is because mplayer is able to use a directory as "device" (i.e. if you
  copy a DVD on the harddisk), or even single files (.iso files, for example).
---
 completions/mplayer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/completions/mplayer b/completions/mplayer
index ed5ab92c..de1aea51 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -93,7 +93,7 @@ _mplayer()
             return 0
             ;;
         -dvd-device)
-            _dvd_devices
+            _filedir
             return 0
             ;;
         -mixer|-dvdauth|-fb|-zrdev)

From cd8dcff223a27cc0950cc377e450c32b2590edd3 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Sat, 18 Dec 2010 23:38:43 +0100
Subject: [PATCH 205/214] Oops, add info to CHANGES for last commit

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 6f43f657..49a44a52 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ bash-completion (2.x)
 
   [ David Paleino ]
   * Fixed "service" completion, thanks to John Hedges (Debian: #586210)
+  * Complete on all files for mplayer's -dvd-device
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.

From 2d4ebbaf25d324ad03e9f231ab7fe9ec55b259a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 20 Dec 2010 23:44:59 +0200
Subject: [PATCH 206/214] Ignore muttrc source entries that are not files
 (Alioth: #312881).

---
 CHANGES          | 1 +
 completions/mutt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 49a44a52..e89aeef3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ bash-completion (2.x)
   * Add/improve various autotools completions.
   * Add *.apk to unzip and jar filename completions.
   * Do not load bash_completion in profile.d script if progcomp is not enabled.
+  * Ignore muttrc source entries that are not files (Alioth: #312881).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/mutt b/completions/mutt
index b8124f28..a753a652 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -58,7 +58,7 @@ _muttconffiles()
     while [[ "$1" ]]; do
         newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval echo $1) ) )
         for file in "${newconffiles[@]}"; do
-            [[ ! "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
+            [[ ! -f "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
                 continue
             sofar="$sofar $file"
             sofar=" $(eval _muttconffiles \"$sofar\" $file) "

From 15bc11769b87b253568b243697533d92a3eddd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 23 Dec 2010 22:05:55 +0200
Subject: [PATCH 207/214] Improve scp path escape regex.

The previous one reportedly ended up escaping 't' to '\t' in some
setups (at least bash 3.2.48 on OS X 10.6, but not with 4.1.7 on
Fedora nor 3.2.25 on CentOS), probably due to missing backslash in the
regex.  This one removes some spurious escaping and duplicates in the
char class, and should communicate the intent better.
---
 completions/ssh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/completions/ssh b/completions/ssh
index 6793ddf0..cf966ae5 100644
--- a/completions/ssh
+++ b/completions/ssh
@@ -246,8 +246,8 @@ _sftp()
 }
 shopt -u hostcomplete && complete -F _sftp sftp
 
-# things we want to escape in remote scp paths
-_scp_path_esc="[][(){}<>\",:;^&\!$=?\`|\\ \t']"
+# things we want to backslash escape in scp paths
+_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.

From 24a37fc8405c811d22369e1a7cce08605c324941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 2 Jan 2011 23:43:28 +0200
Subject: [PATCH 208/214] Note autotools installation steps.

---
 README | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 725678ac..9a8ba24c 100644
--- a/README
+++ b/README
@@ -15,17 +15,20 @@ fi
 (if you happen to have *only* bash >= 3.2 installed, see further if not)
 
 If you don't have the package readily available for your distribution, or
-you simply don't want to do this, put the bash_completion file somewhere
-on your system and source it from either /etc/bashrc or ~/.bashrc, as
-explained above.
+you simply don't want to use one, you can install bash completion using the
+standard commands for GNU autotools packages:
 
-A more elaborate way that takes care of not loading on old, unsupported
-bash versions as well as some other conditions is included in the bash
-completion package as bash_completion.sh.  If your system has the
-/etc/profile.d directory and loads all files from it automatically,
-you may place the file in it.  If not, place the file somewhere on your
-system and source it from /etc/bashrc or ~/.bashrc, or copy its contents
-to one of those files.
+./configure
+make
+make check # optional
+make install # as root
+
+These commands installs the completions and helpers, as well as a
+profile.d script that loads bash_completion where appropriate.  If
+your system does not use the profile.d directory (usually below /etc)
+mechanism, i.e. does not automatically source shell scripts in it, you
+can source the $sysconfdir/profile.d/bash_completion.sh script in
+/etc/bashrc or ~/.bashrc.
 
 If you're using MacOS X, /etc/bashrc is apparently not sourced at all.
 In that case, you should put the bash_completion file in /sw/etc and add

From d37b36605e4f7b12e079d37d5a60598a12fb57bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 2 Jan 2011 23:49:58 +0200
Subject: [PATCH 209/214] Do _filedir in _command_offset only for commands with
 no completions installed.

If we have a completion installed for the actual command invoked via
sudo etc, it is very much possible and fine that no completions are
returned from it, and doing _filedir in these cases is not the right
thing to do.
---
 bash_completion | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bash_completion b/bash_completion
index e4787f20..61d450c9 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1527,10 +1527,10 @@ _command_offset()
                 cspec=${cspec%%${cmd##*/}};
                 COMPREPLY=( $( eval compgen "$cspec" -- "$cur" ) );
             fi
+        elif [ ${#COMPREPLY[@]} -eq 0 ]; then
+            _filedir
         fi
     fi
-
-    [ ${#COMPREPLY[@]} -eq 0 ] && _filedir
 }
 complete -F _command aoss command do else eval exec ltrace nice nohup padsp \
     then time tsocks vsound xargs

From bc8bfb7ba86ac2702fb544c251a2b7f5e49baf40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 3 Jan 2011 00:01:55 +0200
Subject: [PATCH 210/214] Note test suite dependencies.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 9a8ba24c..71758cd0 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ standard commands for GNU autotools packages:
 
 ./configure
 make
-make check # optional
+make check # optional, requires dejagnu and tcllib
 make install # as root
 
 These commands installs the completions and helpers, as well as a

From 6c21f884567783be204174fa970b677aa5923cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 4 Jan 2011 00:19:48 +0200
Subject: [PATCH 211/214] Append /sbin to PATH when invoking sysctl.

---
 completions/sysctl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/completions/sysctl b/completions/sysctl
index 41cbd7ee..ac25f4ef 100644
--- a/completions/sysctl
+++ b/completions/sysctl
@@ -8,7 +8,8 @@ _sysctl()
     COMPREPLY=()
     _get_comp_words_by_ref cur
 
-    COMPREPLY=( $( compgen -W "$(sysctl -N -a 2>/dev/null)" -- "$cur" ) )
+    COMPREPLY=( $( compgen -W \
+        "$( PATH="$PATH:/sbin" sysctl -N -a 2>/dev/null )" -- "$cur" ) )
 
     return 0
 } &&

From bda497eb58b0ec2a3385dab98ee42b3221f4e1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 4 Jan 2011 19:07:30 +0200
Subject: [PATCH 212/214] Add bunch of java option completions, improve colon
 handling.

---
 CHANGES          |  2 +-
 completions/java | 89 ++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index e89aeef3..b6d10539 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@ bash-completion (2.x)
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
-  * Improve /etc/init.d/*, ipmitool, jar, javadoc, man, mencoder, mkdir,
+  * Improve /etc/init.d/*, ipmitool, jar, java, javadoc, man, mencoder, mkdir,
     mplayer, povray, python, rpmbuild, sqlite3, tar, wodim, and general help
     parsing completions.
   * Fix p4 and povray completions (Alioth: #312625).
diff --git a/completions/java b/completions/java
index fcdc5723..8365a314 100644
--- a/completions/java
+++ b/completions/java
@@ -118,13 +118,13 @@ _java_packages()
 #
 _java()
 {
-    local cur prev i
+    local cur prev words cword i
 
     COMPREPLY=()
-    _get_comp_words_by_ref cur prev
+    _get_comp_words_by_ref -n : cur prev words cword
 
-    for ((i=1; i < $COMP_CWORD; i++)); do
-        case ${COMP_WORDS[$i]} in
+    for ((i=1; i < $cword; i++)); do
+        case ${words[$i]} in
             -cp|-classpath)
                 ((i++)) # skip the classpath string.
                 ;;
@@ -139,6 +139,70 @@ _java()
         esac
     done
 
+    case $cur in
+        # standard option completions
+        -verbose:*)
+            COMPREPLY=( $( compgen -W 'class gc jni' -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -javaagent:*)
+            cur=${cur#*:}
+            _filedir '@(jar|zip)'
+            return 0
+            ;;
+        -agentpath:*)
+            cur=${cur#*:}
+            _filedir so
+            return 0
+            ;;
+        # various non-standard option completions
+        -splash:*)
+            cur=${cur#*:}
+            _filedir '@(gif|jp?(e)g|png)'
+            return 0
+            ;;
+        -Xbootclasspath*:*)
+            _java_path
+            return 0
+            ;;
+        -Xcheck:*)
+            COMPREPLY=( $( compgen -W 'jni' -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -Xgc:*)
+            COMPREPLY=( $( compgen -W 'singlecon gencon singlepar genpar' \
+                -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -Xgcprio:*)
+            COMPREPLY=( $( compgen -W 'throughput pausetime deterministic' \
+                -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -Xloggc:*|-Xverboselog:*)
+            cur=${cur#*:}
+            _filedir
+            return 0
+            ;;
+        -Xshare:*)
+            COMPREPLY=( $( compgen -W 'auto off on' -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -Xverbose:*)
+            COMPREPLY=( $( compgen -W 'memory load jni cpuinfo codegen opt
+                gcpause gcreport' -- "${cur#*:}" ) )
+            return 0
+            ;;
+        -Xverify:*)
+            COMPREPLY=( $( compgen -W 'all none remote' -- "${cur#*:}" ) )
+            return 0
+            ;;
+        # the rest that we have no completions for
+        -D*|-*:*)
+            return 0
+            ;;
+    esac
+
     case $prev in
         -cp|-classpath)
             _java_path
@@ -147,13 +211,11 @@ _java()
     esac
 
     if [[ "$cur" == -* ]]; then
-        # relevant options completion
-        COMPREPLY=( $( compgen -W '-client -hotspot -server -classic \
-            -classpath -D -verbose -verbose:class \
-            -verbose:gc -version:jni -version \
-            -showversion -help -X -jar \
-            -enableassertions -disableassertions \
-            -enablesystemassertions -disablesystemassertions ' -- "$cur" ) )
+        # standard options
+        COMPREPLY=( $( compgen -W '-client -server -agentlib: -agentpath:
+            -classpath -D -d32 -d64 -enableassertions -disableassertions
+            -enablesystemassertions -disablesystemassertions -jar -javaagent:
+            -verbose -verbose -version -showversion -help -X' -- "$cur" ) )
     else
         if [[ "$prev" == -jar ]]; then
             # jar file completion
@@ -163,6 +225,11 @@ _java()
             _java_classes
         fi
     fi
+
+    [[ ${#COMPREPLY[@]} -eq 1 && ${COMPREPLY[0]} == -*[:=] ]] && \
+        type compopt &>/dev/null && compopt -o nospace
+
+    __ltrim_colon_completions "$cur"
 }
 complete -F _java java
 }

From b1dbd1d7123c1541833db4e78383dade281ac702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 5 Jan 2011 22:59:05 +0200
Subject: [PATCH 213/214] (testsuite) Fix sysctl test case (Alioth: #312909).

---
 test/lib/completions/sysctl.exp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lib/completions/sysctl.exp b/test/lib/completions/sysctl.exp
index d163ea5a..6aa9ffe0 100644
--- a/test/lib/completions/sysctl.exp
+++ b/test/lib/completions/sysctl.exp
@@ -12,7 +12,8 @@ setup
 
 
 if {[assert_exec {sysctl -N -a 2>/dev/null | grep ^kern | sort -u} values]} {
-    assert_complete $values "sysctl kern"
+    set test "sysctl kern should show completions"
+    assert_complete $values "sysctl kern" $test -expect-cmd-minus kern
 }
 
 

From fe2d7645df9f619a33feb8c8d7c89b1ea5fcad6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 8 Jan 2011 23:28:38 +0200
Subject: [PATCH 214/214] Re-enable postgresql database and user completion
 (Alioth: #312914, Ubuntu: #164772).

This implementation uses -w which is available only in psql >= 8.4,
but the net effect with earlier versions should be the same as when
the completions were disabled.
---
 CHANGES                |  2 ++
 completions/postgresql | 17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index b6d10539..046cb595 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,6 +42,8 @@ bash-completion (2.x)
   * Add *.apk to unzip and jar filename completions.
   * Do not load bash_completion in profile.d script if progcomp is not enabled.
   * Ignore muttrc source entries that are not files (Alioth: #312881).
+  * Re-enable postgresql database and user completion (Alioth: #312914,
+    Ubuntu: #164772).
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/postgresql b/completions/postgresql
index d42d6e17..f874b67b 100644
--- a/completions/postgresql
+++ b/completions/postgresql
@@ -3,19 +3,18 @@
 have psql && {
 _pg_databases()
 {
-    return # See https://launchpad.net/bugs/164772
-    COMPREPLY=( $( compgen -W "$( psql -l 2>/dev/null | \
-        sed -e '1,/^-/d' -e '/^(/,$d' | \
-        awk '{print $1}' )" -- "$cur" ) )
+    # -w was introduced in 8.4, https://launchpad.net/bugs/164772
+    # "Access privileges" in output may contain linefeeds, hence the NF > 1
+    COMPREPLY=( $( compgen -W "$( psql -AtqwlF $'\t' 2>/dev/null | \
+        awk 'NF > 1 { print $1 }' )" -- "$cur" ) )
 }
 
 _pg_users()
 {
-    # See https://launchpad.net/bugs/164772
-    #COMPREPLY=( $( psql -qtc 'select usename from pg_user' template1 2>/dev/null | \
-    #       command grep "^ $cur" ) )
-    #[ ${#COMPREPLY[@]} -eq 0 ] && COMPREPLY=( $( compgen -u -- $cur ) )
-    COMPREPLY=( $( compgen -u -- "$cur" ) )
+    # -w was introduced in 8.4, https://launchpad.net/bugs/164772
+    COMPREPLY=( $( compgen -W "$( psql -Atqwc 'select usename from pg_user' \
+        template1 2>/dev/null )" -- "$cur" ) )
+    [ ${#COMPREPLY[@]} -eq 0 ] && COMPREPLY=( $( compgen -u -- "$cur" ) )
 }
 
 # createdb(1) completion