[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 4e83dce5cef0de8bbd1b8e884d289ae17631d746
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Mar 28 11:40:31 2009 +0200

    Revert "Get mencoder profile completions from mencoder.conf, thanks to Droz Raphaël."
    
    This reverts commit cce8fc8941db7096e20c697edf32c7d0f46dc1b8.

diff --git a/CHANGES b/CHANGES
index a1c488f..ca15d1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -140,7 +140,6 @@ 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 30d7937..11d928e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -6084,9 +6084,7 @@ _mplayer()
 			return 0
 			;;
 		-profile)
-			local pfile=config
-			[[ "$cmd" == 'mencoder' ]] && pfile=mencoder.conf
-			local profiles=$(sed -ne 's|\[\(.*\)\]|\1|p' ~/.mplayer/$pfile 2>/dev/null)
+			local profiles=$(sed -ne 's|\[\(.*\)\]|\1|p' ~/.mplayer/config)
 			COMPREPLY=( $( compgen -W "$profiles" -- $cur))
 			return 0
 			;;
diff --git a/debian/changelog b/debian/changelog
index 92062cc..6d3a91f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,7 +140,6 @@ 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