From 511fc6e367e886fda47569acafc8f82ba1265546 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 24 Mar 2012 22:49:20 +0000 Subject: 30368: _tmux: complete arguments to unambiguous partial subcommands --- ChangeLog | 6 +++++- Completion/Unix/Command/_tmux | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 940423932..a34ad2c01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ * 30372: Completion/Unix/Command/_tmux: Redirect error output produced when no tmux server is running to /dev/null. + * 30368: Completion/Unix/Command/_tmux: Make completion work + when an unambiguous prefix for a known subcommand is given, as + in 'tmux att -'. + 2012-03-23 Simon Ruderich * 30366: Misc/vcs_info-examples: Fix outdated quilt examples. @@ -16116,5 +16120,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5613 $ +* $Revision: 1.5614 $ ***************************************************** diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux index 3327b1462..39befe884 100644 --- a/Completion/Unix/Command/_tmux +++ b/Completion/Unix/Command/_tmux @@ -1528,6 +1528,18 @@ function _tmux() { if [[ -n ${_tmux_aliasmap[$tmuxcommand]} ]] ; then tmuxcommand="${_tmux_aliasmap[$tmuxcommand]}" fi + if ! (( ${+functions[_tmux-$tmuxcommand]} )); then + local low high + low=$_tmux_commands[(i)$tmuxcommand*] + high=$_tmux_commands[(I)$tmuxcommand*] + if (( low == high )); then + tmuxcommand=${_tmux_commands[low]%%:*} + elif (( low < high )); then + _message -e "Ambiguous command $tmuxcommand" + else + _message -e "Subcommand $tmuxcommand not known" + fi + fi curcontext="${curcontext%:*:*}:tmux-${tmuxcommand}:" _call_function ret _tmux-${tmuxcommand} fi -- cgit 1.4.1