[Bash-completion-commits] [SCM] bash-completion branch, 1.x, updated. 1.2-240-g99522d8

[David Paleino]

The following commit has been merged in the 1.x branch:
commit 99522d8ce4a697b649d93796939a78fc98dd5297
Merge: c300c652ad8000e270726331ecf70fb0bae17e14 b8ad9989234a7b170c653ae5b50622b45cd89ba3
Author: David Paleino <dapal at debian.org>
Date:   Sat Jan 29 22:32:55 2011 +0100

    Merge branch 'master' into 1.x

diff --combined CHANGES
index 25cba1b,86ee358..5e2e02c
--- a/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,10 +1,10 @@@
 -bash-completion (2.x)
 +bash-completion (1.3)
  
    [ Guillaume Rousse ]
    * added pure-perl perldoc completion helper, using work from Aristotle 
      Pagaltzis (pagaltzis at gmx.de)
    * added completions for xfreerdp and iscsiadm
+   * updated xm subcommands list
  
    [ David Paleino ]
    * Fixed "service" completion, thanks to John Hedges (Debian: #586210)
@@@ -13,9 -14,9 +14,9 @@@
    [ 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, lsof, portecle,
-     POSIX sh, sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb
-     completions.
+     filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, mktemp,
+     portecle, 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.
@@@ -48,6 -49,7 +49,7 @@@
    * Ignore muttrc source entries that are not files (Alioth: #312881).
    * Re-enable postgresql database and user completion (Alioth: #312914,
      Ubuntu: #164772).
+   * Add *.fdf to various PDF viewer completions.
  
    [ Freddy Vulto ]
    * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --combined bash_completion
index 5ee3939,0b5005e..a9b8120
--- a/bash_completion
+++ b/bash_completion
@@@ -23,7 -23,7 +23,7 @@@
  #
  #   http://bash-completion.alioth.debian.org/
  #
 -#   RELEASE: 2.x
 +#   RELEASE: 1.1
  
  if [[ $- == *v* ]]; then
      BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
@@@ -84,9 -84,9 +84,9 @@@ complete -f -X '!*.@(gif|jp?(e)g|tif?(f
  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' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
- complete -f -X '!*.pdf' acroread gpdf xpdf
+ complete -f -X '!*.[pf]df' 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 '!*.@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|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?(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
@@@ -128,7 -128,7 +128,7 @@@ complete -f -X '!@(*.@(ks|jks|jceks|p12
  # start of section containing compspecs that can be handled within bash
  
  # user commands see only users
- complete -u su write chfn groups slay w sux
+ complete -u su write chfn groups slay w sux runuser
  
  # bg completes with stopped jobs
  complete -A stopped -P '"%' -S '"' bg

-- 
bash-completion