Merge branch 'more-solarized'

Conflict resolution:
Use ANSI LightBlue for both br_violet and "regular" violet to mimic the
effect of commit 754a3b4 (LightBlue is
more visible).

Author: jan-warchol

editors/vim/README.md

@@ -39,17 +39,18 @@ Syntax coloring choices
 -----------------------
 
 Selenized aims to have a similar feel to Solarized, but it doesn't follow all
-Solarized coloring choices. In particular, I believe that using green for
-keywords doesn't look good, so I've made them yellow (swapping with types,
+Solarized coloring choices. In particular, I believe that using **green for
+keywords** doesn't look good, so I've made them yellow (swapping with types,
 which are yellow in Solarized). If you don't like this choice, add this to your
 `.vimrc`:
 
     let g:selenized_green_keywords=1
 
-Also note that selenized doesn't use orange and violet because they are not
-available in ANSI color palette (Solarized worked around this with an [ugly
-hack](https://github.com/jan-warchol/selenized/blob/master/whats-wrong-with-solarized.md#problems-with-implementation)).
-However, I plan to use orange and violet in the GUI version of the theme.
+Also note that selenized uses **orange and violet** only in the GUI/truecolor
+version of the theme.  That's because they are not available in ANSI color
+palette (Solarized worked around this with an [ugly
+hack](https://github.com/jan-warchol/selenized/blob/master/whats-wrong-with-solarized.md#problems-with-implementation),
+but I prefer to keep compatibility).
 
 
 Contributing

editors/vim/_hl_groups.colortemplate

@@ -5,29 +5,41 @@ Term colors: bg_2 br_red br_green br_yellow br_blue br_magenta br_cyan fg_1
 
 Variant: gui 256 16
 
-# default syntax group
+# default coloring
 Normal               fg_0          bg_0
 
+
 # Interface elements {{{
 
 # Group              Foreground    Background    Attributes
-IncSearch            red           none          reverse
+
+# selections and highlights
+IncSearch            orange        none          reverse
 Search               yellow        none          reverse
+QuickFixLine      -> Search
 Visual               none          bg_2
-LineNr               dim_0         bg_1
-CursorLineNr         fg_1          none
+MatchParen           br_yellow     bg_2          bold
+
+# cursor-related
+Cursor               none          none          reverse
+lCursor           -> Cursor        # See `:help lCursor`
 CursorLine           none          bg_1
 CursorColumn         none          bg_1
-ColorColumn          none          bg_1
-MatchParen           br_yellow     bg_2          bold
+
+# in-buffer borders etc.
 Folded               none          bg_1
+ColorColumn          none          bg_2
+LineNr               dim_0         bg_1
+CursorLineNr         fg_1          none
 
-# window (pane) borders etc.
+# window (pane) borders
 VertSplit            dim_0         dim_0
 StatusLine           none          none          reverse
 StatusLineNC         none          bg_2
 StatusLineTerm    -> StatusLine
 StatusLineTermNC  -> StatusLineNC
+
+# bars on the top
 TabLineSel           fg_1          bg_1          reverse bold
 TabLine              dim_0         none          reverse
 TabLineFill          dim_0         none          reverse
@@ -46,68 +58,70 @@ DiffChange           none          bg_1
 DiffDelete           red           bg_1
 DiffText             bg_1          yellow
 
-# commonly linked groups
-QuickFixLine      -> Search
-# See `:help lCursor`
-lCursor           -> Cursor
-
 # }}}
 
+
 # Syntax elements {{{
 
 # Group              Foreground    Background    Attributes
 Comment              dim_0         none          italic
-Constant             cyan          none
-Identifier           br_blue       none
-Statement            br_yellow     none
-PreProc              magenta       none
-Type                 green         none
-Special              red           none
-Error                red           none          bold
-Todo                 magenta       bg_1          bold reverse
-Underlined           br_blue       none          underline
 
-#if get(g:, '@optionprefix_green_keywords', 0)
-  Statement            green         none
-  Type                 yellow        none
-#endif
-
-# commonly linked groups
-Function          -> Identifier
+Constant             cyan          none
 String            -> Constant
 Number            -> Constant
 Boolean           -> Constant
 Character         -> Constant
 Float             -> Constant
+
+Identifier           br_blue       none
+Function          -> Identifier
+
+Statement            br_yellow     none
 Conditional       -> Statement
-Exception         -> Statement
+Repeat            -> Statement
 Keyword           -> Statement
 Label             -> Statement
+Exception         -> Statement
 Operator          -> Statement
-Repeat            -> Statement
+
+PreProc              orange        none
 Define            -> PreProc
-Include           -> PreProc
-Macro             -> PreProc
 PreCondit         -> PreProc
+Include           -> PreProc
+Macro             -> Include
+
+Type                 green         none
+Typedef           -> Type
+StorageClass      -> Type
+Structure         -> Type
+
+Special              red           none
 SpecialChar       -> Special
+Delimiter         -> Special
 SpecialComment    -> Special
 Debug             -> Special
-Delimiter         -> Special
 Tag               -> Special
-StorageClass      -> Type
-Structure         -> Type
-Typedef           -> Type
-# }}}
 
-# Vim
-VimCommand        -> Statement
+Error                red           none          bold
+Todo                 magenta       none          bold
+Underlined           violet        none          underline
+Ignore               bg_2          none
+
+# Language-specific coloring (use sparingly)
+VimCommand           yellow        none
+RubyDefine           fg_1          none          bold
+
+#if get(g:, '@optionprefix_green_keywords', 0)
+  Statement            green         none
+  Type                 yellow        none
+#endif
+
 
 # Remaining unstyled highlight groups {{{
 
 # Group              Foreground    Background    Attributes
 Terminal             none          none
 Conceal              none          none
-Cursor               none          none
 Directory            none          none
 EndOfBuffer          none          none
 ErrorMsg             none          none
@@ -127,6 +141,4 @@ VisualNOS            none          none
 WarningMsg           none          none
 WildMenu             none          none
 
-Ignore               none          none
-
 # }}}