[Bash-completion-commits] [SCM] bash-completion branch, 1.x, updated. 1.2-228-g8d152a2

David Paleino dapal at debian.org
Sun Jan 16 10:36:36 UTC 2011


The following commit has been merged in the 1.x branch:
commit 8d152a2f75964afb52f25b617719168c7f4a95b3
Merge: cf4fe7f7a97984ff9816a5ea0ff18ca24c927900 6833d7c6a611c1e1cbd9cf0200bae15e80bdc38f
Author: David Paleino <dapal at debian.org>
Date:   Sun Jan 16 11:36:01 2011 +0100

    Merge branch 'master' into 1.x

diff --combined CHANGES
index 6c4b3a6,c1180d7..4a564da
--- a/CHANGES
+++ b/CHANGES
@@@ -1,4 -1,4 +1,4 @@@
 -bash-completion (2.x)
 +bash-completion (1.3)
  
    [ Guillaume Rousse ]
    * added pure-perl perldoc completion helper, using work from Aristotle 
@@@ -12,8 -12,9 +12,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, 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 --combined bash_completion
index 9b63059,4c0b02b..5ee3939
--- a/bash_completion
+++ b/bash_completion
@@@ -2,7 -2,7 +2,7 @@@
  #   bash_completion - programmable completion functions for bash 3.2+
  #
  #   Copyright © 2006-2008, Ian Macdonald <ian at caliban.org>
- #             © 2009-2010, Bash Completion Maintainers
+ #             © 2009-2011, Bash Completion Maintainers
  #                     <bash-completion-devel at lists.alioth.debian.org>
  #
  #   This program is free software; you can redistribute it and/or modify
@@@ -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"
@@@ -122,6 -122,7 +122,7 @@@ complete -f -X '!*.[Hh][Rr][Bb]' hbru
  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

-- 
bash-completion



More information about the Bash-completion-commits mailing list