1 files changed, 29 insertions, 4 deletions

diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index b9c220f17..80c69d2fb 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -567,7 +567,7 @@ _tmux-list-windows() {
   [[ -n ${tmux_describe} ]] && print "list windows of a session" && return
   _arguments -s \
     '-a[list all windows the tmux server possesses]' \
-    '-F[specify output format]:format:__tmux-formats' \
+    '-F+[specify output format]:format:__tmux-formats' \
     '-f+[filter items]:filter format:__tmux-formats' \
     '-t+[specify session]:session:__tmux-sessions'
 }
@@ -764,7 +764,7 @@ _tmux-respawn-pane() {
     '-c+[specify a new working directory for the pane]:directory:_directories' \
     '*-e[specify environment variable]:environment variable:_parameters -g "*export*" -qS=' \
     '-k[kill window if it is in use]' \
-    '-t+[specify target pane]:pane:__tmux-pane' \
+    '-t+[specify target pane]:pane:__tmux-panes' \
     ':command:_cmdambivalent'
 }
 
@@ -886,7 +886,7 @@ _tmux-server-access() {
 }
 
 _tmux-set-buffer() {
-  [[ -n ${tmux_describe} ]] && print "set contents of a paster buffer" && return
+  [[ -n ${tmux_describe} ]] && print "set contents of a paste buffer" && return
   _arguments -s -A "-*" -S \
     '-a[append to rather than overwriting target buffer]' \
     '-b+[specify target buffer index]:pane:__tmux-buffers' \
@@ -999,7 +999,7 @@ _tmux-show-hooks() {
 
 _tmux-show-buffer() {
   [[ -n ${tmux_describe} ]] && print "display the contents of a paste buffer" && return
-  _arguments '-b[specify target buffer index]:pane:->buffer'
+  _arguments '-b[specify target buffer index]:buffer:__tmux-buffers'
 }
 
 _tmux-show-environment() {
@@ -1648,16 +1648,22 @@ function __tmux-session-options() {
         'display-panes-active-colour:colour for active pane in display-panes'
         'display-panes-time:time (in msecs) of display-panes output'
         'display-time:time (in msecs) messages are displayed'
+        'focus-follows-mouse:select panes when the mouse enters them'
         'history-limit:number of copy-mode lines per window'
+        'initial-repeat-time:initial repeat-key timeout'
         'key-table:default key table'
         'lock-after-time:lock sessions after N seconds'
         'lock-command:command to run for locking a client'
         'message-command-style:status line message command style'
+        'message-format:prompt and message area format'
         'message-line:status message and command prompt position'
         'message-style:status line message style'
         'mouse:enable mouse support'
         'prefix:primary prefix key'
         'prefix2:secondary prefix key'
+        'prompt-command-cursor-style:cursor style in vi prompt command mode'
+        'prompt-cursor-colour:prompt cursor colour'
+        'prompt-cursor-style:prompt cursor style'
         'renumber-windows:renumber windows if a window is closed'
         'repeat-time:time for multiple commands without prefix-key presses'
         'set-titles:try to set xterm window titles'
@@ -1729,22 +1735,29 @@ function __tmux-server-options() {
     tmux_server_options=(
         'backspace:set key sent by tmux for backspace'
         'buffer-limit:number of buffers kept per session'
+        'codepoint-widths:list of override widths for Unicode codepoints'
         'command-alias:custom command aliases'
         'copy-command:specify the default command when "copy-pipe" is called without arguments'
+        'default-client-command:default tmux command with no subcommand'
         'default-terminal:default terminal definition string'
         'escape-time:set timeout to detect single escape characters (in msecs)'
         'editor:specify the command used when tmux runs an editor'
         'exit-unattached:make server exit if it has no attached clients'
         'exit-empty:exit when there are no active sessions'
         'extended-keys:control whether tmux will send extended keys through to the terminal'
+        'extended-keys-format:extended-key output format'
         'focus-events:request focus events from terminal'
+        'get-clipboard:how tmux answers clipboard requests'
         'history-file:tmux command history file name'
+        'input-buffer-size:input bytes allowed before dropping'
         'message-limit:set size of message log per client'
+        'prefix-timeout:prefix-key timeout'
         'prompt-history-limit:set the number of history items to save in the history file'
         'set-clipboard:use esc sequences to set terminal clipboard'
         'terminal-features:set terminal features not detected by terminfo'
         'terminal-overrides:override terminal descriptions'
         'user-keys:set list of user-defined key escape sequences'
+        'variation-selector-always-wide:treat Unicode VS16 as always wide'
     )
     _describe -t tmux-server-options 'tmux server option' tmux_server_options
 }
@@ -1800,6 +1813,7 @@ function __tmux-window-options() {
         'aggressive-resize:aggressively resize windows'
         'allow-passthrough:allow programs in the pane to bypass tmux'
         'allow-rename:allow programs to change window titles'
+        'allow-set-title:allow apps to set pane titles'
         'alternate-screen:allow alternate screen feature to be used'
         'automatic-rename-format:format for automatic renames'
         'automatic-rename:attempt to automatically rename windows'
@@ -1808,6 +1822,9 @@ function __tmux-window-options() {
         'copy-mode-current-match-style:set the style of the current search match in copy mode'
         'copy-mode-mark-style:set the style of the line containing the mark in copy mode'
         'copy-mode-match-style:set the style of search matches in copy mode'
+        'copy-mode-position-format:format for the position indicator in copy mode'
+        'copy-mode-position-style:style for position indicator in copy mode'
+        'copy-mode-selection-style:style for selection in copy mode'
         'cursor-colour:set the colour of the cursor'
         'cursor-style:set the style of the cursor'
         'fill-character:set the character used to fill unused window areas'
@@ -1832,13 +1849,21 @@ function __tmux-window-options() {
         'pane-border-status:turn border status off or set its position'
         'pane-border-style:style of border pane'
         "pane-colours:an array used to configure tmux's colour palette"
+        'pane-scrollbars:pane scrollbar visibility mode'
+        'pane-scrollbars-position:side used for pane scrollbars'
+        'pane-scrollbars-style:pane scrollbar style'
+        'pane-status-current-style:current pane status-line style'
+        'pane-status-style:pane status-line style'
         'popup-border-lines:set the type of line used to draw popup borders'
         "popup-border-style:set the style for the popup's border"
         'popup-style:set the popup style'
         "remain-on-exit:don't destroy windows after the program exits"
         "remain-on-exit-format:set the text shown at bottom of exited panes"
         'scroll-on-clear:scroll previous contents into history before clear'
+        'session-status-current-style:current session status-line style'
+        'session-status-style:session status-line style'
         'synchronize-panes:send input to all panes of a window'
+        'tiled-layout-max-columns:column limit for the tiled layout'
         'window-active-style:style of active window'
         'window-size:indicate how to automatically size windows'
         'window-status-activity-style:style of status bar activity tag'