summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2012-03-24 22:49:20 +0000
committerMikael Magnusson <mikachu@gmail.com>2012-03-24 22:49:20 +0000
commit511fc6e367e886fda47569acafc8f82ba1265546 (patch)
tree7349b1f3c8066c3a480c54dba1762954f1481216
parent9db18318288d7a413885fb5d1618bf239b6ed182 (diff)
downloadzsh-511fc6e367e886fda47569acafc8f82ba1265546.tar.gz
zsh-511fc6e367e886fda47569acafc8f82ba1265546.tar.xz
zsh-511fc6e367e886fda47569acafc8f82ba1265546.zip
30368: _tmux: complete arguments to unambiguous partial subcommands
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_tmux12
2 files changed, 17 insertions, 1 deletions
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 -<tab>'.
+
 2012-03-23  Simon Ruderich  <simon@ruderich.org>
 
 	* 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