From 6c6255f2d733cc6e7ffc64a065b80825d33f8c40 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 5 Jun 2010 23:54:51 +0000 Subject: [PATCH] Sync OpenBSD patchset 700: Accept (and document) "none" instead of "default" for attributes as it is clearer and avoids confusion with default colours. --- attributes.c | 6 +++--- tmux.1 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/attributes.c b/attributes.c index 4010c651..6c9a4dde 100644 --- a/attributes.c +++ b/attributes.c @@ -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 @@ -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; diff --git a/tmux.1 b/tmux.1 index 481574f7..ac19c8f8 100644 --- a/tmux.1 +++ b/tmux.1 @@ -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 .\" @@ -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