github #106: update tmux completion (20230919); tweak Util/check-tmux-state

- update tmux completion functions
- tweak check-tmux-state to take current file format into account

3 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e5863fea..4f5c6b024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-11-14  Oliver Kiddle  <opk@zsh.org>
 
+	* github #106: Matt Koscica: Completion/Unix/Command/_tmux,
+	Util/check-tmux-state: update tmux completion (20230919)
+
 	* unposted (cf. 52167): Completion/Unix/Command/_mutt:
 	mutt's -a takes a list of files terminated by --
 
diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index c8ed24b26..b9c220f17 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -145,7 +145,6 @@ _tmux_aliasmap=(
     if          if-shell
     lock        lock-server
     run         run-shell
-    info        server-info
     wait        wait-for
 )
 
@@ -881,7 +880,7 @@ _tmux-send-prefix() {
 # aliasmap system in check-tmux-state can properly handle aliases which are
 # more complex than a single word, it's best to leave this here.
 
-_tmux-server-info() {
+_tmux-server-access() {
   [[ -n ${tmux_describe} ]] && print "show server information" && return
   __tmux-nothing-else
 }
@@ -1654,6 +1653,7 @@ function __tmux-session-options() {
         '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-line:status message and command prompt position'
         'message-style:status line message style'
         'mouse:enable mouse support'
         'prefix:primary prefix key'
@@ -1798,6 +1798,7 @@ function __tmux-window-options() {
     local -a tmux_window_options
     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'
         'alternate-screen:allow alternate screen feature to be used'
         'automatic-rename-format:format for automatic renames'
@@ -1809,8 +1810,13 @@ function __tmux-window-options() {
         'copy-mode-match-style:set the style of search matches 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'
         'main-pane-height:set height for main-* layouts'
         'main-pane-width:set width for main-* layouts'
+        'menu-style:set the menu style'
+        'menu-selected-style:set the selected menu item style'
+        'menu-border-style:set the menu border style'
+        'menu-border-lines:set the type of characters used for drawing menu borders'
         'mode-keys:mode to use in copy and choice modes (vi/emacs)'
         'mode-style:set window modes style'
         'monitor-activity:monitor window activity'
@@ -1830,6 +1836,8 @@ function __tmux-window-options() {
         "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'
         'synchronize-panes:send input to all panes of a window'
         'window-active-style:style of active window'
         'window-size:indicate how to automatically size windows'
diff --git a/Util/check-tmux-state b/Util/check-tmux-state
index d95e0c230..9772eefc1 100755
--- a/Util/check-tmux-state
+++ b/Util/check-tmux-state
@@ -59,7 +59,7 @@ __tmux-window-options
 # in the _tmux function definition file.
 typeset -a supported_commands
 supported_commands=( $( grep '^_tmux-[^(]*() *{$' $func |
-                        sed -e 's,^.*\<_tmux-,,' -e 's,(.*$,,' ) )
+                        sed -e 's,^_tmux[-]\([a-z-]*\)[(].*,\1,' ) )
 
 # Ask tmux for available commands:
 typeset -a available_commands