summaryrefslogtreecommitdiffstats
path: root/attributes.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-06-05 23:54:51 +0000
committerTiago Cunha <tcunha@gmx.com>2010-06-05 23:54:51 +0000
commit6c6255f2d733cc6e7ffc64a065b80825d33f8c40 (patch)
tree1b31c42f3b7a2f0b11f17c55ff74f85c2ee0bb6b /attributes.c
parent227e458ebbd69d1e8d22f9013de111f734608ba7 (diff)
Sync OpenBSD patchset 700:
Accept (and document) "none" instead of "default" for attributes as it is clearer and avoids confusion with default colours.
Diffstat (limited to 'attributes.c')
-rw-r--r--attributes.c6
1 files changed, 3 insertions, 3 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 <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;