Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32715
Modified Files:
attributes.c tmux.1
Log Message:
Sync OpenBSD patchset 700:
Accept (and document) "none" instead of "default" for attributes as it
is clearer and avoids confusion with default colours.
Index: attributes.c
===================================================================
RCS file: /cvsroot/tmux/tmux/attributes.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- attributes.c 28 Nov 2009 14:46:23 -0000 1.3
+++ attributes.c 5 Jun 2010 23:54:51 -0000 1.4
@@ -28,7 +28,7 @@
static char buf[128];
if (attr == 0)
- return ("default");
+ return ("none");
buf[0] = '\0';
if (attr & GRID_ATTR_BRIGHT)
@@ -63,7 +63,7 @@
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;
Index: tmux.1
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.1,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- tmux.1 14 May 2010 14:33:39 -0000 1.249
+++ tmux.1 5 Jun 2010 23:54:51 -0000 1.250
@@ -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 @@
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
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
