summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2010-05-14 18:56:21 +0000
committerNicholas Marriott <nicm@openbsd.org>2010-05-14 18:56:21 +0000
commit4af4d124759b4648bded82482f4d043ad2b3bb79 (patch)
tree7bd33e54333d7f9fc548be6bd3c1700bda0b9a06
parente5f01febd71fcb4390788a6d9c989b27a81cd94e (diff)
Accept (and document) "none" instead of "default" for attributes as it
is clearer and avoids confusion with default colours.
-rw-r--r--attributes.c4
-rw-r--r--tmux.12
2 files changed, 3 insertions, 3 deletions
diff --git a/attributes.c b/attributes.c
index 0e42c787..81f29452 100644
--- a/attributes.c
+++ b/attributes.c
@@ -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 26966cb6..85aabdb7 100644
--- a/tmux.1
+++ b/tmux.1
@@ -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