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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 2b56b95caaff8d5d5990eca4e6b66c07e4bb3ef4
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jul 2 22:54:05 2009 +0300

    Associate OOXML/MS Office 2007 extensions with OpenOffice tools.

diff --git a/CHANGES b/CHANGES
index 4a847b1..a355bbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -90,6 +90,7 @@ bash-completion (1.x)
     are available.
   * Invoke the actual mplayer/mencoder command being completed (with full path)
     to get various completions instead of simply "mplayer" or "mencoder".
+  * Associate OOXML/MS Office 2007 extensions with OpenOffice tools.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/bash_completion b/bash_completion
index ed62d3c..ef44349 100644
--- a/bash_completion
+++ b/bash_completion
@@ -135,9 +135,9 @@ complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)
 complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR|exe.so)' wine
 complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme
 complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya
-complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter
-complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress
-complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc
+complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|odt|ott|odm)' oowriter
+complete -f -X '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|odp|otp)' ooimpress
+complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|csv|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

-- 
bash-completion