* Merge from Gentoo:

- fix CVS completion
This commit is contained in:
David Paleino 2008-12-14 14:05:40 +01:00
parent cd67a78bb6
commit fb383d4d92
2 changed files with 4 additions and 3 deletions

View File

@ -1687,7 +1687,7 @@ _cvs()
for i in "${entries[@]}"; do for i in "${entries[@]}"; do
files=( ${files[@]/#$i//} ) files=( ${files[@]/#$i//} )
done done
COMPREPLY=( $( compgen -W '${files[@]}' -- \ COMPREPLY=( $( compgen -X '*~' -W '${files[@]}' -- \
$cur ) ) $cur ) )
fi fi
else else
@ -1740,7 +1740,7 @@ _cvs()
COMPREPLY=( $( compgen -W '${changed[@]:-} \ COMPREPLY=( $( compgen -W '${changed[@]:-} \
${newremoved[@]:-}' -- $cur ) ) ${newremoved[@]:-}' -- $cur ) )
else else
_filedir COMPREPLY=( $(compgen $default -- "$cur") )
fi fi
else else
COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \ COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \

3
debian/changelog vendored
View File

@ -52,13 +52,14 @@ bash-completion (200811xx) UNRELEASED; urgency=low
- use make -qp to parse the Makefile for us, so we get proper completion - use make -qp to parse the Makefile for us, so we get proper completion
on things like pattern rules. Patch by Mike Kelly <pioto@exherbo.org>. on things like pattern rules. Patch by Mike Kelly <pioto@exherbo.org>.
- complete on gkrellm2 as well. Patch by Aaron Walker. - complete on gkrellm2 as well. Patch by Aaron Walker.
- fix CVS completion
* debian/links fixed (Closes: #494292) * debian/links fixed (Closes: #494292)
* debian/control: * debian/control:
- fixed typo in the long description - fixed typo in the long description
* debian/install: * debian/install:
- correctly install contrib/* under /etc/bash_completion.d/ - correctly install contrib/* under /etc/bash_completion.d/
-- David Paleino <d.paleino@gmail.com> Thu, 11 Dec 2008 20:15:03 +0100 -- David Paleino <d.paleino@gmail.com> Sun, 14 Dec 2008 14:05:12 +0100
bash-completion (20080705) unstable; urgency=low bash-completion (20080705) unstable; urgency=low