From e783e088a1f85292e54206a32f8fa321731f12fe Mon Sep 17 00:00:00 2001 From: David Paleino Date: Fri, 9 Jan 2009 12:19:15 +0100 Subject: [PATCH] Fixed completion of environment variables, thanks to Morita Sho (Closes: #272660) --- bash_completion | 7 +++++-- debian/changelog | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bash_completion b/bash_completion index 040228e1..e07bda8c 100644 --- a/bash_completion +++ b/bash_completion @@ -3085,6 +3085,9 @@ _cd() return 0 fi + # Enable -o filenames option, see Debian bug #272660 + compgen -f /non-existing-dir/ >/dev/null + # Use standard dir completion if no CDPATH or parameter starts with /, # ./ or ../ if [ -z "${CDPATH:-}" ] || [[ "$cur" == ?(.)?(.)/* ]]; then @@ -3119,9 +3122,9 @@ _cd() return 0 } if shopt -q cdable_vars; then - complete -v -F _cd $nospace $filenames cd + complete -v -F _cd $nospace cd else - complete -F _cd $nospace $filenames cd + complete -F _cd $nospace cd fi _remove_comp_word() diff --git a/debian/changelog b/debian/changelog index fb3df1f4..06c76b05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ bash-completion (200811xx) UNRELEASED; urgency=low * Added monodevelop and mdtool completions. * Split subversion-related completions to contrib/_subversion (prefixed with _ to avoid file conflicts with upstream's one) + * Fixed completion of environment variables, thanks to Morita Sho + (Closes: #272660) * Merge from Gentoo: - fix 'find' completion so that it properly completes on -?(i)whilename. Patch by Ciaran McCreesh. @@ -67,7 +69,7 @@ bash-completion (200811xx) UNRELEASED; urgency=low * debian/install: - correctly install contrib/* under /etc/bash_completion.d/ - -- David Paleino Thu, 08 Jan 2009 16:32:15 +0100 + -- David Paleino Fri, 09 Jan 2009 12:17:16 +0100 bash-completion (20080705) unstable; urgency=low