Merge tag 'zsh-5.1.1-test-1' into debian

1 files changed, 7 insertions, 9 deletions

diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index 49c2b63ed..d218cc3f3 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -1,6 +1,6 @@
 #compdef tmux
 
-# tmux <http://tmux.sf.net> completion for zsh <http://zsh.sf.net>.
+# tmux <http://tmux.github.io> completion for zsh <http://zsh.sf.net>.
 #
 # Configuration:
 #
@@ -640,7 +640,7 @@ function _tmux-new-session() {
         '-t[specify target session]:sessions:__tmux-sessions'
         '-x[specify width]:width:_guard "[0-9]#" "numeric value"'
         '-y[specify height]:height:_guard "[0-9]#" "numeric value"'
-        '*:: :_command'
+        '*:: :_cmdstring'
     )
     _arguments -s ${args}
 }
@@ -657,7 +657,7 @@ function _tmux-new-window() {
         '-n[specify a window name]:window name:'
         '-P[print information about new window after it is created]'
         '-t[specify target window]:windows:__tmux-windows'
-        '*:: :_command'
+        '*:: :_cmdstring'
     )
     _arguments ${args}
 }
@@ -776,7 +776,7 @@ function _tmux-respawn-pane() {
     args=(
         '-k[kill window if it is in use]'
         '-t[choose target pane]:window:__tmux-pane'
-        '*::command:_command'
+        '*::command:_cmdstring'
     )
     _arguments ${args}
 }
@@ -787,7 +787,7 @@ function _tmux-respawn-window() {
     args=(
         '-k[kill window if it is in use]'
         '-t[choose target window]:window:__tmux-windows'
-        '*::command:_command'
+        '*::command:_cmdstring'
     )
     _arguments ${args}
 }
@@ -809,7 +809,7 @@ function _tmux-run-shell() {
     args=(
         '-b[run shell command in background]'
         '-t[choose target pane]:pane:__tmux-panes'
-        '*::command:_command'
+        '*::command:_cmdstring'
     )
     _arguments ${args}
 }
@@ -1042,7 +1042,7 @@ function _tmux-split-window() {
         # changing the command's name might annoy users. So it stays like
         # this.
         '-t[choose target pane]:window:__tmux-panes'
-        '*:: :_command'
+        '*:: :_cmdstring'
     )
     _arguments ${args} && return
 }
@@ -1270,7 +1270,6 @@ function __tmux-option-guard() {
             'history-limit:'${int_guard}
             'lock-after-time:'${int_guard}
             'lock-command:MSG:command string'
-            'lock-server:DESC:on off'
             'message-command-style:__tmux-style'
             'message-style:__tmux-style'
             'mouse:DESC:on off'
@@ -1394,7 +1393,6 @@ function __tmux-session-options() {
         'history-limit:number of copy-mode lines per window'
         'lock-after-time:lock sessions after N seconds'
         'lock-command:command to run for locking a client'
-        'lock-server:make lock-after-time lock the server instead of sessions'
         'message-command-style:status line message command style'
         'message-style:status line message style'
         'mouse:enable mouse support'