From a5f7b9520a56fc849781500268895b832c2b7eb8 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Thu, 21 Apr 2016 20:03:42 +0200 Subject: [PATCH] Check the value of the 'stl' setting on SessionLoadPost Restoring a session using vim -S with 'sessionopts' including options, might overwrite the statusline function. fixes #1131 --- plugin/airline.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/airline.vim b/plugin/airline.vim index 813244d2..d44419d7 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -41,6 +41,7 @@ function! s:on_window_changed() " different autocommands. let l:key = [bufnr('%'), winnr(), winnr('$')] if get(t:, 'airline_last_window_changed', []) == l:key + \ && &stl =~? 'airline#statusline(\d\+)$' return endif let t:airline_last_window_changed = l:key @@ -86,7 +87,7 @@ function! s:airline_toggle() autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter') autocmd GUIEnter,ColorScheme * call on_colorscheme_changed() - autocmd VimEnter,WinEnter,BufWinEnter,FileType,BufUnload,VimResized * + autocmd SessionLoadPost,VimEnter,WinEnter,BufWinEnter,FileType,BufUnload,VimResized * \ call on_window_changed() autocmd TabEnter * :unlet! w:airline_lastmode