zsh-workers
 help / color / mirror / code / Atom feed
From: Frank Terbeck <ft@bewatermyfriend.org>
To: zsh-workers@zsh.org
Subject: [PATCH 13/18] _tmux: Fix options with changed scope
Date: Mon, 10 Aug 2015 15:27:33 +0200	[thread overview]
Message-ID: <1439213258-14196-14-git-send-email-ft@bewatermyfriend.org> (raw)
In-Reply-To: <1439213258-14196-1-git-send-email-ft@bewatermyfriend.org>

---
 Completion/Unix/Command/_tmux | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index ce15e91..70a9f26 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -1256,11 +1256,9 @@ function __tmux-option-guard() {
         options=(
             'base-index:'${int_guard}
             'bell-action:DESC:any none current'
-            'buffer-limit:'${int_guard}
             'default-command:MSG:command string'
             'default-path:MSG:path name'
             'default-shell:MSG:shell executable'
-            'default-terminal:MSG:terminal string'
             'display-panes-colour:__tmux-colours'
             'display-panes-active-colour:__tmux-colours'
             'display-panes-time:'${int_guard}
@@ -1272,7 +1270,6 @@ function __tmux-option-guard() {
             'message-attr:__tmux-attributes'
             'message-bg:__tmux-colours'
             'message-fg:__tmux-colours'
-            'message-limit:'${int_guard}
             'mouse-select-pane:DESC:on off'
             'pane-border-bg:__tmux-colours'
             'pane-border-fg:__tmux-colours'
@@ -1301,7 +1298,6 @@ function __tmux-option-guard() {
             'status-right-fg:__tmux-colours'
             'status-right-length:'${int_guard}
             'status-utf8:DESC:on off'
-            'terminal-overrides:MSG:overrides string'
             'update-environment:MSG:string listing env. variables'
             'visual-activity:DESC:on off'
             'visual-bell:DESC:on off'
@@ -1309,8 +1305,12 @@ function __tmux-option-guard() {
         )
     elif [[ ${mode} == 'server' ]]; then
         options=(
+            'buffer-limit:'${int_guard}
+            'default-terminal:MSG:terminal string'
             'escape-time:'${int_guard}
+            'message-limit:'${int_guard}
             'quiet:DESC:on off'
+            'terminal-overrides:MSG:overrides string'
         )
     else
         options=(
@@ -1372,11 +1372,9 @@ function __tmux-session-options() {
     tmux_session_options=(
         'base-index:define where to start numbering'
         'bell-action:set action on window bell'
-        'buffer-limit:number of buffers kept per session'
         'default-command:default command for new windows'
         'default-path:default working directory'
         'default-shell:default shell executable'
-        'default-terminal:default terminal definition string'
         'display-panes-colour:colour used for display-panes'
         'display-panes-active-colour:colour for active pane in display-panes'
         'display-panes-time:time (in msecs) of display-panes output'
@@ -1388,7 +1386,6 @@ function __tmux-session-options() {
         'message-attr:set status line message attributes'
         'message-bg:set status line message background colour'
         'message-fg:set status line message foreground colour'
-        'message-limit:set size of message log per client'
         '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'
@@ -1417,7 +1414,6 @@ function __tmux-session-options() {
         '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'
-        'terminal-overrides:override terminal descriptions'
         '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'
@@ -1470,8 +1466,12 @@ function __tmux-panes() {
 function __tmux-server-options() {
     local -a tmux_server_options
     tmux_server_options=(
+        'buffer-limit:number of buffers kept per session'
+        'default-terminal:default terminal definition string'
         'escape-time:set timeout to detect single escape characters (in msecs)'
+        'message-limit:set size of message log per client'
         'quiet:enable/disable the display of various informational messages'
+        'terminal-overrides:override terminal descriptions'
     )
     _describe -t tmux-server-options 'tmux server option' tmux_server_options
 }
-- 
2.1.4


  parent reply	other threads:[~2015-08-10 13:33 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10 13:27 [PATCH 00/18] Updates for _tmux Frank Terbeck
2015-08-10 13:27 ` [PATCH 01/18] _tmux: Update command line options Frank Terbeck
2015-08-10 13:27 ` [PATCH 02/18] _tmux: Update options for supported commands Frank Terbeck
2015-08-10 13:27 ` [PATCH 03/18] _tmux: Add support for new sub-commands Frank Terbeck
2015-08-10 13:27 ` [PATCH 04/18] _tmux: Remove dead code Frank Terbeck
2015-08-10 13:27 ` [PATCH 05/18] _tmux: Don't unset, set empty in local scope Frank Terbeck
2015-08-10 13:27 ` [PATCH 06/18] _tmux: No need to unset local variables Frank Terbeck
2015-08-10 13:27 ` [PATCH 07/18] _tmux: Replay all arguments when dispatching to new _tmux() Frank Terbeck
2015-08-10 13:27 ` [PATCH 08/18] _tmux: "local -x" serves no purpose Frank Terbeck
2015-08-10 13:27 ` [PATCH 09/18] _tmux: options => session_options Frank Terbeck
2015-08-10 13:27 ` [PATCH 10/18] Add helper script to check state of _tmux completion Frank Terbeck
2015-08-10 15:20   ` wrapping "local" (was: Re: [PATCH 10/18] Add helper script to check state of _tmux completion) Frank Terbeck
2015-08-10 15:32     ` Peter Stephenson
2015-08-10 15:50       ` [PATCH] Disable ‘local’ keyword in script to make data retrieval work Frank Terbeck
2015-08-10 13:27 ` [PATCH 11/18] _tmux: Remove old sub-commands and their aliases Frank Terbeck
2015-08-10 13:27 ` [PATCH 12/18] _tmux: Add new command aliases Frank Terbeck
2015-08-10 13:27 ` Frank Terbeck [this message]
2015-08-10 13:27 ` [PATCH 14/18] _tmux: Remove support for old options Frank Terbeck
2015-08-10 13:27 ` [PATCH 15/18] _tmux: Add new session options Frank Terbeck
2015-08-10 13:27 ` [PATCH 16/18] _tmux: Add support for new server options Frank Terbeck
2015-08-10 13:27 ` [PATCH 17/18] _tmux: Add support for new window options Frank Terbeck
2015-08-10 13:27 ` [PATCH 18/18] _tmux: Update TODO Frank Terbeck
2015-08-10 13:52 ` [PATCH 00/18] Updates for _tmux Peter Stephenson
2015-08-10 14:46 ` [PATCH 19/18] _tmux: Update bell-action and prefix options Frank Terbeck
2015-08-10 14:46   ` [PATCH 20/18] _tmux: Fix \ooo display in completion list Frank Terbeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439213258-14196-14-git-send-email-ft@bewatermyfriend.org \
    --to=ft@bewatermyfriend.org \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).