From bc7e828f10b51da16c03452c871e5c5405312167 Mon Sep 17 00:00:00 2001 From: itchyny Date: Fri, 22 Jun 2018 08:53:26 +0900 Subject: [PATCH] fix colorscheme initialization on MacVim (fix #308) --- autoload/lightline.vim | 8 +++++--- plugin/lightline.vim | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/autoload/lightline.vim b/autoload/lightline.vim index eea9c9a..4571c1d 100644 --- a/autoload/lightline.vim +++ b/autoload/lightline.vim @@ -2,7 +2,7 @@ " Filename: autoload/lightline.vim " Author: itchyny " License: MIT License -" Last Change: 2017/12/31 15:55:00. +" Last Change: 2018/06/22 08:50:00. " ============================================================================= let s:save_cpo = &cpo @@ -47,8 +47,10 @@ function! lightline#enable() abort endif augroup lightline autocmd! - autocmd WinEnter,BufWinEnter,FileType,ColorScheme,SessionLoadPost * call lightline#update() - autocmd ColorScheme,SessionLoadPost * call lightline#highlight() + autocmd WinEnter,BufWinEnter,FileType,SessionLoadPost * call lightline#update() + autocmd SessionLoadPost * call lightline#highlight() + autocmd ColorScheme * if !has('vim_starting') || expand('') !=# 'macvim' + \ | call lightline#update() | call lightline#highlight() | endif autocmd CursorMoved,BufUnload * call lightline#update_once() augroup END augroup lightline-disable diff --git a/plugin/lightline.vim b/plugin/lightline.vim index f396010..fc8f598 100644 --- a/plugin/lightline.vim +++ b/plugin/lightline.vim @@ -2,7 +2,7 @@ " Filename: plugin/lightline.vim " Author: itchyny " License: MIT License -" Last Change: 2016/03/14 03:31:58. +" Last Change: 2018/06/22 08:49:00. " ============================================================================= if exists('g:loaded_lightline') || v:version < 700 @@ -15,8 +15,10 @@ set cpo&vim augroup lightline autocmd! - autocmd WinEnter,BufWinEnter,FileType,ColorScheme,SessionLoadPost * call lightline#update() - autocmd ColorScheme,SessionLoadPost * call lightline#highlight() + autocmd WinEnter,BufWinEnter,FileType,SessionLoadPost * call lightline#update() + autocmd SessionLoadPost * call lightline#highlight() + autocmd ColorScheme * if !has('vim_starting') || expand('') !=# 'macvim' + \ | call lightline#update() | call lightline#highlight() | endif autocmd CursorMoved,BufUnload * call lightline#update_once() augroup END