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

[Ville Skyttä]

The following commit has been merged in the frozen/1.0 branch:
commit d1b72130cf158f3beba01696a76f9e7f00548d9e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Mar 28 11:40:12 2009 +0200

    Use "-profile help" to get mplayer and friends -profile completions.

diff --git a/CHANGES b/CHANGES
index ca15d1a..8bb48ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -140,6 +140,7 @@ bash-completion (1.0)
   * Simplify bash_completion.sh, return earlier in non-applicable environments.
   * Remove obsolete --buildarch and --buildos rpm(build) completions.
   * Add rpmbuild --target completion.
+  * Use "-profile help" to get mplayer and friends -profile completions.
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing
diff --git a/bash_completion b/bash_completion
index 11d928e..3e36d89 100644
--- a/bash_completion
+++ b/bash_completion
@@ -6084,8 +6084,7 @@ _mplayer()
 			return 0
 			;;
 		-profile)
-			local profiles=$(sed -ne 's|\[\(.*\)\]|\1|p' ~/.mplayer/config)
-			COMPREPLY=( $( compgen -W "$profiles" -- $cur))
+			_mplayer_options_list $cmd $prev
 			return 0
 			;;
 	esac
diff --git a/debian/changelog b/debian/changelog
index 6d3a91f..e5bfa68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,7 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   * Simplify bash_completion.sh, return earlier in non-applicable environments.
   * Remove obsolete --buildarch and --buildos rpm(build) completions.
   * Add rpmbuild --target completion.
+  * Use "-profile help" to get mplayer and friends -profile completions.
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing

-- 
bash-completion