diff options
| author | David Paleino <dapal@debian.org> | 2011-01-16 11:36:01 +0100 |
|---|---|---|
| committer | David Paleino <dapal@debian.org> | 2011-01-16 11:36:01 +0100 |
| commit | 8d152a2f75964afb52f25b617719168c7f4a95b3 (patch) | |
| tree | 13f297a116d86c8749ff2db597678d45c0b17649 | |
| parent | cf4fe7f7a97984ff9816a5ea0ff18ca24c927900 (diff) | |
| parent | 6833d7c6a611c1e1cbd9cf0200bae15e80bdc38f (diff) | |
| download | bash-completion-8d152a2f75964afb52f25b617719168c7f4a95b3.tar.gz | |
Merge branch 'master' into 1.x
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | bash_completion | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -12,8 +12,9 @@ bash-completion (1.3) [ 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, POSIX sh, - sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb completions. + filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, 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. diff --git a/bash_completion b/bash_completion index 9b63059a..5ee3939f 100644 --- a/bash_completion +++ b/bash_completion @@ -2,7 +2,7 @@ # bash_completion - programmable completion functions for bash 3.2+ # # Copyright © 2006-2008, Ian Macdonald <ian@caliban.org> -# © 2009-2010, Bash Completion Maintainers +# © 2009-2011, Bash Completion Maintainers # <bash-completion-devel@lists.alioth.debian.org> # # This program is free software; you can redistribute it and/or modify @@ -122,6 +122,7 @@ 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 '!*.lyx' lyx +complete -f -X '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath|pem|p10|csr|crl)|cacerts)' portecle # FINISH exclude -- do not remove this line # start of section containing compspecs that can be handled within bash |