From cce8fc8941db7096e20c697edf32c7d0f46dc1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 28 Mar 2009 11:23:37 +0200 Subject: [PATCH] =?UTF-8?q?Get=20mencoder=20profile=20completions=20from?= =?UTF-8?q?=20mencoder.conf,=20thanks=20to=20Droz=20Rapha=C3=ABl.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES | 1 + bash_completion | 4 +++- debian/changelog | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ca15d1ac..a1c488f0 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 11d928e4..30d79372 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 6d3a91f4..92062cc4 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