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

[David Paleino]

The following commit has been merged in the master branch:
commit 975e950192ceac5e1237424f0be12c405e6dc6f6
Author: David Paleino <d.paleino at gmail.com>
Date:   Wed Sep 23 23:38:52 2009 +0200

    Split okular from evince filename extension completion, add okular-specific completions.
    
        Needed to add okular-specific completions: xps, epub, odt, fb, mobi,
        g3 and chm.
        Also, okular can read any of its formats also in .gz/.bz2 compressed
        format, so change the regular expression to match this.

diff --git a/CHANGES b/CHANGES
index ea425f9..f0235ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,10 @@ bash-completion (1.x)
     Xuefer (Gentoo: #284563)
   * Added --no-generate to "apt-cache pkgnames" calls, make it faster
     on certain configurations (Debian: #547550)
+  * Split okular from evince filename extension completion, needed to add
+    okular-specific completions: xps, epub, odt, fb, mobi, g3 and chm.
+    Also, okular can read any of its formats also in .gz/.bz2 compressed
+    format, so change the regular expression to match this.
   * Patches from PLD Linux (thanks to Elan Ruusamäe):
     - avoid sed pipe as ps itself can omit the headers
     - improve service(8) completion, also look for "msg_usage"
diff --git a/bash_completion b/bash_completion
index 8b4021f..46ef492 100644
--- a/bash_completion
+++ b/bash_completion
@@ -116,7 +116,8 @@ complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' 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)' evince okular
+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)' evince
+complete -f -X '!*.@(?(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)?(.?(gz|GZ|bz2|BZ2))' okular
 complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|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)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi

-- 
bash-completion