From ae5d956c931b1909156c358448aa831cb1f03651 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 14 May 2010 18:56:22 +0000 Subject: Accept (and document) "none" instead of "default" for attributes as it is clearer and avoids confusion with default colours. --- usr.bin/tmux/attributes.c | 6 +++--- usr.bin/tmux/tmux.1 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'usr.bin/tmux') diff --git a/usr.bin/tmux/attributes.c b/usr.bin/tmux/attributes.c index 7ea1d5d164c..3431b5f2128 100644 --- a/usr.bin/tmux/attributes.c +++ b/usr.bin/tmux/attributes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: attributes.c,v 1.3 2009/11/26 21:22:31 nicm Exp $ */ +/* $OpenBSD: attributes.c,v 1.4 2010/05/14 18:56:21 nicm 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/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index e1d6f0ca2b3..a96e5dce37f 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.167 2010/05/05 23:24:23 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.168 2010/05/14 18:56:21 nicm 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 -- cgit v1.2.3