circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 700: 

Accept (and document) "none" instead of "default" for attributes as it
is clearer and avoids confusion with default colours.
pull/1/head
Tiago Cunha 2010-06-05 23:54:51 +00:00
parent 227e458ebb
commit 6c6255f2d7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
attributes.c
View File

@ -1,4 +1,4 @@
/* $Id: attributes.c,v 1.3 2009-11-28 14:46:23 tcunha Exp $ */
/* $Id: attributes.c,v 1.4 2010-06-05 23:54:51 tcunha Exp $ */
/*
* Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
@ -28,7 +28,7 @@ attributes_tostring(u_char attr)
static char buf[128];
if (attr == 0)
return ("default");
return ("none");
buf[0] = '\0';
if (attr & GRID_ATTR_BRIGHT)
@ -63,7 +63,7 @@ attributes_fromstring(const char *str)
if (strchr(delimiters, str[strlen(str) - 1]) != NULL)
return (-1);
if (strcasecmp(str, "default") == 0)
if (strcasecmp(str, "default") == 0 || strcasecmp(str, "none") == 0)
return (0);
attr = 0;

6
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.249 2010-05-14 14:33:39 tcunha Exp $
.\" $Id: tmux.1,v 1.250 2010-06-05 23:54:51 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: May 5 2010 $
.Dd $Mdocdate: May 14 2010 $
.Dt TMUX 1
.Os
.Sh NAME
@ -1589,7 +1589,7 @@ This has no effect as a session option; it must be set as a global option.
Set status line message attributes, where
.Ar attributes
is either
.Ic default
.Ic none
or a comma-delimited list of one or more of:
.Ic bright
(or