From 2a10bfc32f347e57309635394b5bb056b60004a8 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Sun, 11 Aug 2013 13:42:47 +0000 Subject: [PATCH] make the mode and branch text window local --- autoload/airline.vim | 3 ++- autoload/airline/extensions/branch.vim | 2 +- plugin/airline.vim | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/autoload/airline.vim b/autoload/airline.vim index c84167c8..82f644c9 100644 --- a/autoload/airline.vim +++ b/autoload/airline.vim @@ -168,9 +168,10 @@ function! airline#update_highlight() else let l:mode = ['normal'] endif - let g:airline_current_mode_text = get(g:airline_mode_map, l:m, l:m) + let w:airline_current_mode = get(g:airline_mode_map, l:m, l:m) else let l:mode = ['inactive'] + let w:airline_current_mode = get(g:airline_mode_map, '__') endif if g:airline_detect_modified && &modified | call add(l:mode, 'modified') | endif diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index 277ae9f5..1b86fb7d 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -2,7 +2,7 @@ " vim: ts=2 sts=2 sw=2 fdm=indent function! airline#extensions#branch#apply() - let g:airline_current_branch = exists('*fugitive#head') && strlen(fugitive#head()) > 0 + let w:airline_current_branch = exists('*fugitive#head') && strlen(fugitive#head()) > 0 \ ? g:airline_branch_prefix.fugitive#head() \ : exists('*lawrencium#statusline') && strlen(lawrencium#statusline()) > 0 \ ? g:airline_branch_prefix.lawrencium#statusline() diff --git a/plugin/airline.vim b/plugin/airline.vim index 28d62914..3a037a11 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -42,6 +42,7 @@ call s:check_defined('g:airline_statusline_funcrefs', []) call s:check_defined('g:airline_exclude_funcrefs', []) call s:check_defined('g:airline_mode_map', { + \ '__' : ' ---- ', \ 'n' : 'NORMAL', \ 'i' : 'INSERT', \ 'R' : 'REPLACE', @@ -54,8 +55,8 @@ call s:check_defined('g:airline_mode_map', { \ '' : 'S-BLOCK', \ }) -call s:check_defined('g:airline_section_a', '%{get(g:, "airline_current_mode_text", "")}') -call s:check_defined('g:airline_section_b', '%{get(g:, "airline_current_branch", "")}') +call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}') +call s:check_defined('g:airline_section_b', '%{get(w:, "airline_current_branch", "")}') call s:check_defined('g:airline_section_c', '%f%m') call s:check_defined('g:airline_section_gutter', '') call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}")