Revision: 2742
http://tmux.svn.sourceforge.net/tmux/?rev=2742&view=rev
Author: tcunha
Date: 2012-03-18 02:09:51 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
Sync OpenBSD patchset 1063:
Add -q option to set-option to turn off info message, from marcel partap.
Modified Paths:
--------------
trunk/cmd-set-option.c
trunk/tmux.1
Modified: trunk/cmd-set-option.c
===================================================================
--- trunk/cmd-set-option.c 2012-03-18 02:03:15 UTC (rev 2741)
+++ trunk/cmd-set-option.c 2012-03-18 02:09:51 UTC (rev 2742)
@@ -60,8 +60,8 @@
const struct cmd_entry cmd_set_option_entry = {
"set-option", "set",
- "agst:uw", 1, 2,
- "[-agsuw] [-t target-session|target-window] option [value]",
+ "agqst:uw", 1, 2,
+ "[-agsquw] [-t target-session|target-window] option [value]",
0,
NULL,
NULL,
@@ -70,8 +70,8 @@
const struct cmd_entry cmd_set_window_option_entry = {
"set-window-option", "setw",
- "agt:u", 1, 2,
- "[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
+ "agqt:u", 1, 2,
+ "[-agqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
0,
NULL,
NULL,
@@ -175,7 +175,8 @@
}
options_remove(oo, oe->name);
- ctx->info(ctx, "unset option: %s", oe->name);
+ if (!args_has(args, 'q'))
+ ctx->info(ctx, "unset option: %s", oe->name);
return (0);
}
@@ -184,6 +185,7 @@
cmd_set_option_set(struct cmd *self, struct cmd_ctx *ctx,
const struct options_table_entry *oe, struct options *oo, const char
*value)
{
+ struct args *args = self->args;
struct options_entry *o;
const char *s;
@@ -220,7 +222,8 @@
return (-1);
s = options_table_print_entry(oe, o);
- ctx->info(ctx, "set option: %s -> %s", oe->name, s);
+ if (!args_has(args, 'q'))
+ ctx->info(ctx, "set option: %s -> %s", oe->name, s);
return (0);
}
@@ -229,7 +232,7 @@
cmd_set_option_string(struct cmd *self, unused struct cmd_ctx *ctx,
const struct options_table_entry *oe, struct options *oo, const char
*value)
{
- struct args *args = self->args;
+ struct args *args = self->args;
struct options_entry *o;
char *oldval, *newval;
Modified: trunk/tmux.1
===================================================================
--- trunk/tmux.1 2012-03-18 02:03:15 UTC (rev 2741)
+++ trunk/tmux.1 2012-03-18 02:09:51 UTC (rev 2742)
@@ -1792,7 +1792,7 @@
Commands which set options are as follows:
.Bl -tag -width Ds
.It Xo Ic set-option
-.Op Fl agsuw
+.Op Fl agqsuw
.Op Fl t Ar target-session | Ar target-window
.Ar option Ar value
.Xc
@@ -1820,6 +1820,12 @@
options.
It is not possible to unset a global option.
.Pp
+The
+.Fl q
+flag suppresses the informational message (as if the
+.Ic quiet
+server option was set).
+.Pp
Available window options are listed under
.Ic set-window-option .
.Pp
@@ -2385,7 +2391,7 @@
.Ql \ -_@ .
.El
.It Xo Ic set-window-option
-.Op Fl agu
+.Op Fl agqu
.Op Fl t Ar target-window
.Ar option Ar value
.Xc
@@ -2393,7 +2399,8 @@
Set a window option.
The
.Fl a ,
-.Fl g
+.Fl g ,
+.Fl q
and
.Fl u
flags work similarly to the
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
