From b69e02075635c73c65fa114295c812f14163efcb Mon Sep 17 00:00:00 2001 From: itchyny Date: Fri, 15 Apr 2016 22:14:08 +0900 Subject: [PATCH] tweak the configuration for ctrlp (close #159) --- README.md | 4 ++-- doc/lightline.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dea9631..5f501cd 100644 --- a/README.md +++ b/README.md @@ -676,7 +676,7 @@ endfunction function! LightLineFilename() let fname = expand('%:t') - return fname == 'ControlP' ? g:lightline.ctrlp_item : + return fname == 'ControlP' && has_key(g:lightline, 'ctrlp_item') ? g:lightline.ctrlp_item : \ fname == '__Tagbar__' ? g:lightline.fname : \ fname =~ '__Gundo\|NERD_tree' ? '' : \ &ft == 'vimfiler' ? vimfiler#get_status_string() : @@ -725,7 +725,7 @@ function! LightLineMode() endfunction function! CtrlPMark() - if expand('%:t') =~ 'ControlP' + if expand('%:t') =~ 'ControlP' && has_key(g:lightline, 'ctrlp_item') call lightline#link('iR'[g:lightline.ctrlp_regex]) return lightline#concatenate([g:lightline.ctrlp_prev, g:lightline.ctrlp_item \ , g:lightline.ctrlp_next], 0) diff --git a/doc/lightline.txt b/doc/lightline.txt index de43b9c..a5dc391 100644 --- a/doc/lightline.txt +++ b/doc/lightline.txt @@ -4,7 +4,7 @@ Version: 0.0 Author: itchyny (https://github.com/itchyny) License: MIT License Repository: https://github.com/itchyny/lightline.vim -Last Change: 2016/03/20 09:33:37. +Last Change: 2016/04/15 22:14:01. CONTENTS *lightline-contents* @@ -786,7 +786,7 @@ For users who uses lots of plugins: function! LightLineFilename() let fname = expand('%:t') - return fname == 'ControlP' ? g:lightline.ctrlp_item : + return fname == 'ControlP' && has_key(g:lightline, 'ctrlp_item') ? g:lightline.ctrlp_item : \ fname == '__Tagbar__' ? g:lightline.fname : \ fname =~ '__Gundo\|NERD_tree' ? '' : \ &ft == 'vimfiler' ? vimfiler#get_status_string() : @@ -835,7 +835,7 @@ For users who uses lots of plugins: endfunction function! CtrlPMark() - if expand('%:t') =~ 'ControlP' + if expand('%:t') =~ 'ControlP' && has_key(g:lightline, 'ctrlp_item') call lightline#link('iR'[g:lightline.ctrlp_regex]) return lightline#concatenate([g:lightline.ctrlp_prev, g:lightline.ctrlp_item \ , g:lightline.ctrlp_next], 0)