[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 9566f5994afc9ee40a7561b0f0ad1422bcedca97

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 9566f5994afc9ee40a7561b0f0ad1422bcedca97
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jun 6 21:18:57 2010 +0300

    Add *.oxt (OpenOffice.org extension) to unzip/zipinfo completions.

diff --git a/CHANGES b/CHANGES
index fb51cab..f835101 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,7 +28,7 @@ bash-completion (2.x)
   * Remove many unnecessary short option completions where long ones exist.
   * Improve chsh, chgrp, chown, configure, curl, cvs, find, gkrellm, gzip,
     iconv, lftp, look, lzma, make, man, mdadm, modprobe, mount, mplayer,
-    mysqladmin, perldoc, rsync, screen, service, scp, ssh, sshfs,
+    mysqladmin, perldoc, rsync, screen, service, scp, ssh, sshfs, unzip,
     update-alternatives, vncviewer, wget, yp-tools, xine based players' and
     general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
diff --git a/bash_completion b/bash_completion
index 27ad613..c5d1536 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|ott|od[fgpst]|epub)' unzip zipinfo
+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 '*.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

-- 
bash-completion