merge attr.go into styles.go, as they are closely related
2 files changed, 17 insertions(+), 32 deletions(-)

R attr.go => 
M style.go
R attr.go =>  +0 -32
@@ 1,32 0,0 @@ 
-// Copyright 2015 The TCell Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use file except in compliance with the License.
-// You may obtain a copy of the license at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tcell
-
-// AttrMask represents a mask of text attributes, apart from color.
-// Note that support for attributes may vary widely across terminals.
-type AttrMask int
-
-// Attributes are not colors, but affect the display of text.  They can
-// be combined.
-const (
-	AttrBold AttrMask = 1 << (25 + iota)
-	AttrBlink
-	AttrReverse
-	AttrUnderline
-	AttrDim
-	AttrNone AttrMask = 0 // Just normal text.
-)
-
-const attrAll = AttrBold | AttrBlink | AttrReverse | AttrUnderline | AttrDim

          
M style.go +17 -0
@@ 14,6 14,23 @@ 
 
 package tcell
 
+// AttrMask represents a mask of text attributes, apart from color.
+// Note that support for attributes may vary widely across terminals.
+type AttrMask int
+
+// Attributes are not colors, but affect the display of text.  They can
+// be combined.
+const (
+	AttrBold AttrMask = 1 << (25 + iota)
+	AttrBlink
+	AttrReverse
+	AttrUnderline
+	AttrDim
+	AttrNone AttrMask = 0 // Just normal text.
+)
+
+const attrAll = AttrBold | AttrBlink | AttrReverse | AttrUnderline | AttrDim
+
 // Style represents a complete text style, including both foreground
 // and background color.  We encode it in a 64-bit int for efficiency.
 // The coding is (MSB): <7b flags><1b><24b fgcolor><7b attr><1b><24b bgcolor>.