From b50433a59bd099286fdc34f0918620a0a0566b3d Mon Sep 17 00:00:00 2001
From: itchyny <neknekneknek.t@gmail.com>
Date: Thu, 22 Aug 2013 01:19:12 +0900
Subject: [PATCH] change colorscheme API

---
 autoload/lightline.vim                       |  2 +-
 autoload/lightline/colorscheme/default.vim   | 24 +++++++++-----------
 autoload/lightline/colorscheme/landscape.vim | 24 +++++++++-----------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/autoload/lightline.vim b/autoload/lightline.vim
index af74ca6..0890a73 100644
--- a/autoload/lightline.vim
+++ b/autoload/lightline.vim
@@ -56,7 +56,7 @@ function! lightline#init()
     let g:lightline.color[m] = get(g:lightline.color, m, {})
   endfor
   try
-    exec 'call lightline#colorscheme#' . g:lightline.colorscheme . '#init()'
+    let g:lightline.color = g:lightline#colorscheme#{g:lightline.colorscheme}#color
     for m in ['normal', 'insert', 'replace', 'visual', 'inactive', 'command']
       call lightline#highlight(m)
     endfor
diff --git a/autoload/lightline/colorscheme/default.vim b/autoload/lightline/colorscheme/default.vim
index 891695c..a773473 100644
--- a/autoload/lightline/colorscheme/default.vim
+++ b/autoload/lightline/colorscheme/default.vim
@@ -1,14 +1,12 @@
+let s:c = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}}
+let s:c.normal.left = [ ['#0000ff', '#ffffff', 21, 231 ], [ '#ffffff', '#0000ff', 231, 21 ], [ '#ffffff', '#0000ff', 231, 21 ] ]
+let s:c.normal.right = [ [ '#303030', '#d0d0d0', 236, 252 ], [ '#303030', '#8a8a8a', 236, 245 ], [ '#bcbcbc', '#585858', 250, 240 ] ]
+let s:c.inactive.right = [ [ '#121212', '#606060', 233, 241 ], [ '#121212', '#3a3a3a', 233, 237 ], [ '#121212', '#262626', 233, 235 ], [ '#121212', '#262626', 233, 235 ] ]
+let s:c.inactive.left = s:c.inactive.right[1:]
+let s:c.insert.left =  [ ['#005f00', '#ffffff', 22, 231 ], [ '#ffffff', '#005f00', 231, 22 ], [ '#ffffff', '#005f00', 231, 22 ] ]
+let s:c.replace.left = [ [ '#af0000', '#ffffff', 124, 231 ], [ '#ffffff', '#af0000', 231, 124 ], [ '#ffffff', '#af0000', 231, 124 ] ]
+let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff', 231, 57 ], [ '#ffffff', '#5f00ff', 231, 57 ] ]
+let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
+let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
 
-function! lightline#colorscheme#default#init()
-  let c = g:lightline.color
-  let c.normal.left = [ ['#0000ff', '#ffffff', 21, 231 ], [ '#ffffff', '#0000ff', 231, 21 ], [ '#ffffff', '#0000ff', 231, 21 ] ]
-  let c.normal.right = [ [ '#303030', '#d0d0d0', 236, 252 ], [ '#303030', '#8a8a8a', 236, 245 ], [ '#bcbcbc', '#585858', 250, 240 ] ]
-  let c.inactive.right = [ [ '#121212', '#606060', 233, 241 ], [ '#121212', '#3a3a3a', 233, 237 ], [ '#121212', '#262626', 233, 235 ], [ '#121212', '#262626', 233, 235 ] ]
-  let c.inactive.left = g:lightline.color.inactive.right[1:]
-  let c.insert.left =  [ ['#005f00', '#ffffff', 22, 231 ], [ '#ffffff', '#005f00', 231, 22 ], [ '#ffffff', '#005f00', 231, 22 ] ]
-  let c.replace.left = [ [ '#af0000', '#ffffff', 124, 231 ], [ '#ffffff', '#af0000', 231, 124 ], [ '#ffffff', '#af0000', 231, 124 ] ]
-  let c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff', 231, 57 ], [ '#ffffff', '#5f00ff', 231, 57 ] ]
-  let c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
-  let c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
-endfunction
-
+let g:lightline#colorscheme#default#color = s:c
diff --git a/autoload/lightline/colorscheme/landscape.vim b/autoload/lightline/colorscheme/landscape.vim
index a39de55..c571970 100644
--- a/autoload/lightline/colorscheme/landscape.vim
+++ b/autoload/lightline/colorscheme/landscape.vim
@@ -1,14 +1,12 @@
+let s:c = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}}
+let s:c.normal.left = [ ['#0000ff', '#ffffff', 21, 231 ], [ '#ffffff', '#0000ff', 231, 21 ], [ '#ffffff', '#0000ff', 231, 21 ] ]
+let s:c.normal.right = [ [ '#303030', '#d0d0d0', 236, 252 ], [ '#303030', '#8a8a8a', 236, 245 ], [ '#bcbcbc', '#585858', 250, 240 ] ]
+let s:c.inactive.right = [ [ '#121212', '#606060', 233, 241 ], [ '#121212', '#3a3a3a', 233, 237 ], [ '#121212', '#262626', 233, 235 ], [ '#121212', '#262626', 233, 235 ] ]
+let s:c.inactive.left = s:c.inactive.right[1:]
+let s:c.insert.left =  [ ['#005f00', '#ffffff', 22, 231 ], [ '#ffffff', '#005f00', 231, 22 ], [ '#ffffff', '#005f00', 231, 22 ] ]
+let s:c.replace.left = [ [ '#af0000', '#ffffff', 124, 231 ], [ '#ffffff', '#af0000', 231, 124 ], [ '#ffffff', '#af0000', 231, 124 ] ]
+let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff', 231, 57 ], [ '#ffffff', '#5f00ff', 231, 57 ] ]
+let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
+let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
 
-function! lightline#colorscheme#landscape#init()
-  let c = g:lightline.color
-  let c.normal.left = [ ['#0000ff', '#ffffff', 21, 231 ], [ '#ffffff', '#0000ff', 231, 21 ], [ '#ffffff', '#0000ff', 231, 21 ] ]
-  let c.normal.right = [ [ '#303030', '#d0d0d0', 236, 252 ], [ '#303030', '#8a8a8a', 236, 245 ], [ '#bcbcbc', '#585858', 250, 240 ] ]
-  let c.inactive.right = [ [ '#121212', '#606060', 233, 241 ], [ '#121212', '#3a3a3a', 233, 237 ], [ '#121212', '#262626', 233, 235 ], [ '#121212', '#262626', 233, 235 ] ]
-  let c.inactive.left = g:lightline.color.inactive.right[1:]
-  let c.insert.left =  [ ['#005f00', '#ffffff', 22, 231 ], [ '#ffffff', '#005f00', 231, 22 ], [ '#ffffff', '#005f00', 231, 22 ] ]
-  let c.replace.left = [ [ '#af0000', '#ffffff', 124, 231 ], [ '#ffffff', '#af0000', 231, 124 ], [ '#ffffff', '#af0000', 231, 124 ] ]
-  let c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff', 231, 57 ], [ '#ffffff', '#5f00ff', 231, 57 ] ]
-  let c.normal.middle = [ '#ffffff', '#303030', 231, 236 ]
-  let c.inactive.middle = [ '#303030', '#121212', 236, 233 ]
-endfunction
-
+let g:lightline#colorscheme#landscape#color = s:c