summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_tmux4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c5b99de6..a58e6cea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-01  Frank Terbeck  <ft@bewatermyfriend.org>
 
+	* 29412: Completion/Unix/Command/_tmux: Disable sub-command
+	completions if tmux is not found in `$path'.
+
 	* Valentin Haenel: 29431: Misc/vcs_info-examples: Hook example for
 	signaling untracked files in git repositories.
 
@@ -14917,5 +14920,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5353 $
+* $Revision: 1.5354 $
 *****************************************************
diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index e9977fbbd..5fb721960 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -1520,6 +1520,10 @@ function _tmux() {
                 _describe -t subcommands 'tmux commands and aliases' _tmux_commands -- _tmux_aliases
             fi
         else
+            if (( ${+commands[tmux]} == 0 )); then
+                _message '`tmux'\'' not found in $path; sub-cmd completions disabled.'
+                return 0
+            fi
             tmuxcommand="${words[1]}"
             if [[ -n ${_tmux_aliasmap[$tmuxcommand]} ]] ; then
                 tmuxcommand="${_tmux_aliasmap[$tmuxcommand]}"