36051: _tmux: Remove support for old options

2 files changed, 3 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index 061e954e2..db11451c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
 	* 36047: Completion/Unix/Command/_tmux: _tmux: Fix options with
 	changed scope
 
+	* 36051: Completion/Unix/Command/_tmux: _tmux: Remove support for
+	old options
+
 2015-08-10  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 36045: Test/A05execution.ztst: make effect of failures
diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index 70a9f262b..517342e47 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -1257,7 +1257,6 @@ function __tmux-option-guard() {
             'base-index:'${int_guard}
             'bell-action:DESC:any none current'
             'default-command:MSG:command string'
-            'default-path:MSG:path name'
             'default-shell:MSG:shell executable'
             'display-panes-colour:__tmux-colours'
             'display-panes-active-colour:__tmux-colours'
@@ -1267,41 +1266,23 @@ function __tmux-option-guard() {
             'lock-after-time:'${int_guard}
             'lock-command:MSG:command string'
             'lock-server:DESC:on off'
-            'message-attr:__tmux-attributes'
-            'message-bg:__tmux-colours'
-            'message-fg:__tmux-colours'
-            'mouse-select-pane:DESC:on off'
-            'pane-border-bg:__tmux-colours'
-            'pane-border-fg:__tmux-colours'
-            'pane-active-border-bg:__tmux-colours'
-            'pane-active-border-fg:__tmux-colours'
             'prefix:MSG:comma-seperated key list'
             'repeat-time:'${int_guard}
             'set-remain-on-exit:DESC:on off'
             'set-titles:DESC:on off'
             'set-titles-string:MSG:title format string'
             'status:DESC:on off'
-            'status-attr:__tmux-attributes'
-            'status-bg:__tmux-colours'
-            'status-fg:__tmux-colours'
             'status-interval:'${int_guard}
             'status-justify:DESC:left centre right'
             'status-keys:DESC:vi emacs'
             'status-left:MSG:format string'
-            'status-left-attr:__tmux-attributes'
-            'status-left-bg:__tmux-colours'
-            'status-left-fg:__tmux-colours'
             'status-left-length:'${int_guard}
             'status-right:MSG:format string'
-            'status-right-attr:__tmux-attributes'
-            'status-right-bg:__tmux-colours'
-            'status-right-fg:__tmux-colours'
             'status-right-length:'${int_guard}
             'status-utf8:DESC:on off'
             'update-environment:MSG:string listing env. variables'
             'visual-activity:DESC:on off'
             'visual-bell:DESC:on off'
-            'visual-content:DESC:on off'
         )
     elif [[ ${mode} == 'server' ]]; then
         options=(
@@ -1323,23 +1304,12 @@ function __tmux-option-guard() {
             'force-width:'${int_guard}
             'main-pane-height:'${int_guard}
             'main-pane-width:'${int_guard}
-            'mode-attr:__tmux-attributes'
-            'mode-bg:__tmux-colours'
-            'mode-fg:__tmux-colours'
             'mode-keys:DESC:vi emacs'
-            'mode-mouse:DESC:on off'
             'monitor-activity:DESC:on off'
-            'monitor-content:MSG:fnmatch(3) pattern'
             'remain-on-exit:DESC:on off'
             'synchronize-panes:DESC:on off'
             'utf8:DESC:on off'
-            'window-status-attr:__tmux-attributes'
-            'window-status-bg:__tmux-colours'
-            'window-status-current-attr:__tmux-attributes'
-            'window-status-current-bg:__tmux-colours'
-            'window-status-current-fg:__tmux-colours'
             'window-status-current-format:MSG:status format string'
-            'window-status-fg:__tmux-colours'
             'window-status-format:MSG:status format string'
             'xterm-keys:DESC:on off'
         )
@@ -1373,7 +1343,6 @@ function __tmux-session-options() {
         'base-index:define where to start numbering'
         'bell-action:set action on window bell'
         'default-command:default command for new windows'
-        'default-path:default working directory'
         'default-shell:default shell executable'
         'display-panes-colour:colour used for display-panes'
         'display-panes-active-colour:colour for active pane in display-panes'
@@ -1383,41 +1352,23 @@ function __tmux-session-options() {
         '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-attr:set status line message attributes'
-        'message-bg:set status line message background colour'
-        'message-fg:set status line message foreground colour'
-        'mouse-select-pane:make mouse clicks select window panes'
-        'pane-border-bg:set pane border foreground colour'
-        'pane-border-fg:set pane border background colour'
-        'pane-active-border-bg:set active pane border foreground colour'
-        'pane-active-border-fg:set active pane border background colour'
         'prefix:comma seperated line of keys accepted as prefix key'
         'repeat-time:time for multiple commands without prefix-key presses'
         'set-remain-on-exit:set remain-on-exit window option'
         'set-titles:try to set xterm window titles'
         'set-titles-string:format used by set-titles'
         'status:show or hide the status bar'
-        'status-attr:status bar attributes'
-        'status-bg:status bar background colour'
-        'status-fg:status bar foreground colour'
         'status-interval:interval (in seconds) for status bar updates'
         'status-justify:position of the window list in status bar'
         'status-keys:mode to use in status bar modes (vi/emacs)'
         'status-left:format to use left in status bar'
-        'status-left-attr:attribute for the left part of the status bar'
-        'status-left-bg:background colour of the left part of the status bar'
-        'status-left-fg:foreground colour of the left part of the status bar'
         'status-left-length:maximum length of the left part of the status bar'
         'status-right:format to use right in status bar'
-        'status-right-attr:attribute for the right part of the status bar'
-        'status-right-bg:background colour of the right part of the status bar'
-        'status-right-fg:foreground colour of the right part of the status bar'
         'status-right-length:maximum length of the right part of the status bar'
         'status-utf8:assume UTF-8 sequences to appear in status bar'
         'update-environment:list of variables to be copied to a session'\''s environment'
         'visual-activity:display status line messages upon activity'
         'visual-bell:use visual bell instead of audible'
-        'visual-content:display status line messages upon content changes'
     )
     _describe -t tmux-options 'tmux session option' tmux_session_options
 }
@@ -1504,23 +1455,12 @@ function __tmux-window-options() {
         'force-width:force a windows to a certain width'
         'main-pane-height:set height for main-* layouts'
         'main-pane-width:set width for main-* layouts'
-        'mode-attr:set window modes attributes'
-        'mode-bg:set window modes background colour'
-        'mode-fg:set window modes foreground colour'
         'mode-keys:mode to use in copy and choice modes (vi/emacs)'
-        'mode-mouse:use mouse in modes'
         'monitor-activity:monitor window activity'
-        'monitor-content:monitor window contents for a fnmatch(3) pattern'
         'remain-on-exit:do not destroy windows after the program exits'
         'synchronize-panes:send input to all panes of a window'
         'utf8:assume UTF-8 sequences to appear in a window'
-        'window-status-attr:set status line attributes for a window'
-        'window-status-bg:set status line background for a window'
-        'window-status-current-attr:set status line attributes for active window'
-        'window-status-current-bg:set status line background for active window'
-        'window-status-current-fg:set status line foreground for active window'
         'window-status-current-format:set status line format for active window'
-        'window-status-fg:set status line foreground for a window'
         'window-status-format:set status line format for all but the active window'
         'xterm-keys:generate xterm-style function key sequences'
     )