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

[Ville Skyttä]

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

    Get mencoder profile completions from mencoder.conf, thanks to Droz Raphaël.

diff --git a/CHANGES b/CHANGES
index ca15d1a..a1c488f 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.
+  * Get mencoder profile completions from mencoder.conf, thanks to Droz Raphaël
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing
diff --git a/bash_completion b/bash_completion
index 11d928e..30d7937 100644
--- a/bash_completion
+++ b/bash_completion
@@ -6084,7 +6084,9 @@ _mplayer()
 			return 0
 			;;
 		-profile)
-			local profiles=$(sed -ne 's|\[\(.*\)\]|\1|p' ~/.mplayer/config)
+			local pfile=config
+			[[ "$cmd" == 'mencoder' ]] && pfile=mencoder.conf
+			local profiles=$(sed -ne 's|\[\(.*\)\]|\1|p' ~/.mplayer/$pfile 2>/dev/null)
 			COMPREPLY=( $( compgen -W "$profiles" -- $cur))
 			return 0
 			;;
diff --git a/debian/changelog b/debian/changelog
index 6d3a91f..92062cc 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.
+  * Get mencoder profile completions from mencoder.conf, thanks to Droz Raphaël
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing

-- 
bash-completion