Sync OpenBSD patchset 394:

Permit attributes to be turned off in #[] by prefixing with "no", for example
"noblink".
This commit is contained in:
Tiago Cunha 2009-10-15 01:31:38 +00:00
parent 8bdcc10c8f
commit 8ab3a3d9aa
2 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $Id: screen-write.c,v 1.73 2009-09-15 23:54:57 tcunha Exp $ */
/* $Id: screen-write.c,v 1.74 2009-10-15 01:31:38 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -347,6 +347,10 @@ screen_write_parsestyle(
bg = defgc->bg;
} else
return;
} else if (end > 2 && strncasecmp(tmp, "no", 2) == 0) {
if ((val = attributes_fromstring(tmp + 2)) == -1)
return;
attr &= ~val;
} else {
if ((val = attributes_fromstring(tmp)) == -1)
return;

16
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.190 2009-10-12 00:38:31 tcunha Exp $
.\" $Id: tmux.1,v 1.191 2009-10-15 01:31:38 tcunha Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: October 11 2009 $
.Dd $Mdocdate: October 12 2009 $
.Dt TMUX 1
.Os
.Sh NAME
@ -1470,22 +1470,26 @@ the
.Ic status-interval
option: if the status line is redrawn in the meantime, the previous result is
used.
.Pp
#[attributes] allows a comma-separated list of attributes to be specified,
these may be
.Ql fg=colour
to set the foreground colour,
.Ql bg=colour
to set the background colour, or one of the attributes described under the
to set the background colour, the name of one of the attributes (listed under the
.Ic message-attr
option.
option) to turn an attribute on, or an attribute prefixed with
.Ql no
to turn one off, for example
.Ic nobright .
Examples are:
.Bd -literal -offset indent
#(sysctl vm.loadavg)
#[fg=yellow,bold]#(apm -l)%%#[default] [#S]
.Ed
.Pp
Where appropriate, these may be prefixed with a number to specify the maximum
length, for example
Where appropriate, special character sequences may be prefixed with a number to
specify the maximum length, for example
.Ql #24T .
.Pp
By default, UTF-8 in