[Bash-completion-commits] [SCM] bash-completion branch, frozen/1.0, updated. 6cf0e5c98895d0f15e8a9518321a693351d3b25b

[David Paleino]

The following commit has been merged in the frozen/1.0 branch:
commit 6cf0e5c98895d0f15e8a9518321a693351d3b25b
Author: David Paleino <d.paleino at gmail.com>
Date:   Wed Mar 25 23:20:30 2009 +0100

    Added .zip to jar completions
    
    Conflicts:
    
    	debian/changelog

diff --git a/CHANGES b/CHANGES
index 3c6774f..ca15d1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -77,6 +77,7 @@ bash-completion (1.0)
   * Remove unused UNAME local variable in _info() (Closes: #501843)
   * AUTHORS added
   * Make _alias() use _get_cword
+  * Added .zip to jar completions
   * Merge from Gentoo:
     - fix 'find' completion so that it properly completes on -?(i)whilename.
       Patch by Ciaran McCreesh.
diff --git a/bash_completion b/bash_completion
index 6d4ad35..11d928e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -3064,7 +3064,7 @@ _jar()
 			_filedir
 			;;
 		*f)
-			_filedir '?(e|j|w)ar'
+			_filedir '?([ejw]ar|zip|[EJW]AR|ZIP)'
 			;;
 		*)
 			_filedir
diff --git a/debian/changelog b/debian/changelog
index 635339c..e0cc7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   * Remove unused UNAME local variable in _info() (Closes: #501843)
   * AUTHORS added
   * Make _alias() use _get_cword
+  * Added .zip to jar completions
   * Merge from Gentoo:
     - fix 'find' completion so that it properly completes on -?(i)whilename.
       Patch by Ciaran McCreesh.
@@ -156,7 +157,7 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   [ Santiago M. Mola ]
   * Add .ape to mplayer supported extensions (Alioth#311510).
 
- -- David Paleino <d.paleino at gmail.com>  Thu, 19 Mar 2009 19:41:38 +0100
+ -- David Paleino <d.paleino at gmail.com>  Wed, 25 Mar 2009 23:18:24 +0100
 
 bash-completion (20080705) unstable; urgency=low
 

-- 
bash-completion