From e8fbd0f0e9d2bf1b0ee8e791c64b3a9eeda76124 Mon Sep 17 00:00:00 2001 From: itchyny Date: Thu, 22 Aug 2013 01:28:02 +0900 Subject: [PATCH] s/color/palette/ --- autoload/lightline.vim | 10 +++++----- autoload/lightline/colorscheme/default.vim | 2 +- autoload/lightline/colorscheme/landscape.vim | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/autoload/lightline.vim b/autoload/lightline.vim index 87411bb..ddeacb3 100644 --- a/autoload/lightline.vim +++ b/autoload/lightline.vim @@ -50,13 +50,13 @@ function! lightline#init() let g:lightline.subseparator = get(g:lightline, 'subseparator', {}) let g:lightline.subseparator.left = get(g:lightline.subseparator, 'left', '') let g:lightline.subseparator.right = get(g:lightline.subseparator, 'right', '') - let g:lightline.color = get(g:lightline, 'color', {}) + let g:lightline.palette = get(g:lightline, 'palette', {}) let g:lightline.colorscheme = get(g:lightline, 'colorscheme', 'default') for m in ['normal', 'insert', 'replace', 'visual', 'inactive'] - let g:lightline.color[m] = get(g:lightline.color, m, {}) + let g:lightline.palette[m] = get(g:lightline.palette, m, {}) endfor try - let g:lightline.color = g:lightline#colorscheme#{g:lightline.colorscheme}#color + let g:lightline.palette = g:lightline#colorscheme#{g:lightline.colorscheme}#palette for m in ['normal', 'insert', 'replace', 'visual', 'inactive', 'command'] call lightline#highlight(m) endfor @@ -82,8 +82,8 @@ function! lightline#mode() endfunction function! lightline#highlight(mode) - let d = has_key(g:lightline.color, a:mode) ? a:mode : 'normal' - let c = g:lightline.color + let d = has_key(g:lightline.palette, a:mode) ? a:mode : 'normal' + let c = g:lightline.palette let left = d == 'inactive' ? g:lightline.inactive.left : g:lightline.active.left let right = d == 'inactive' ? g:lightline.inactive.right : g:lightline.active.right let l = has_key(c, d) && has_key(c[d], 'left') ? c[d].left : c.normal.left diff --git a/autoload/lightline/colorscheme/default.vim b/autoload/lightline/colorscheme/default.vim index a773473..3909c24 100644 --- a/autoload/lightline/colorscheme/default.vim +++ b/autoload/lightline/colorscheme/default.vim @@ -9,4 +9,4 @@ let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ] let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ] -let g:lightline#colorscheme#default#color = s:c +let g:lightline#colorscheme#default#palette = s:c diff --git a/autoload/lightline/colorscheme/landscape.vim b/autoload/lightline/colorscheme/landscape.vim index c571970..2777284 100644 --- a/autoload/lightline/colorscheme/landscape.vim +++ b/autoload/lightline/colorscheme/landscape.vim @@ -9,4 +9,4 @@ let s:c.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff let s:c.normal.middle = [ '#ffffff', '#303030', 231, 236 ] let s:c.inactive.middle = [ '#303030', '#121212', 236, 233 ] -let g:lightline#colorscheme#landscape#color = s:c +let g:lightline#colorscheme#landscape#palette = s:c