[Bash-completion-commits] [SCM] bash-completion branch, master, updated. d9cce3856784dae5ef57474b39b3472567473544

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 8b2416c18026110d8850e2a2baf17d37bca0eb1a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jun 18 20:36:09 2009 +0300

    Invoke the actual mplayer/mencoder command being completed (with full path) to get various completions instead of simply "mplayer" or "mencoder".

diff --git a/CHANGES b/CHANGES
index f7a87d6..4a847b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -88,6 +88,8 @@ bash-completion (1.x)
   * Improve rpm group completion (displayed completions are still wrong).
   * Change many completions to load in memory only if the completed commands
     are available.
+  * Invoke the actual mplayer/mencoder command being completed (with full path)
+    to get various completions instead of simply "mplayer" or "mencoder".
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/contrib/mplayer b/contrib/mplayer
index a6651de..444fe71 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -23,11 +23,11 @@ _mplayer()
 
 	case "$prev" in
 		-@(ac|afm|vc|vfm|ao|vo|vop|fstype|demuxer|vf|af))
-			_mplayer_options_list mplayer $prev
+			_mplayer_options_list $cmd $prev
 			return 0
 			;;
 		-@(oac|ovc|of))
-			_mplayer_options_list mencoder $prev
+			_mplayer_options_list $cmd $prev
 			return 0
 			;;
 		-audiofile)

-- 
bash-completion