Skip to content

Do not reset tabline or statusline if they are not used #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danhorner wants to merge 2 commits into
base: master
Choose a base branch
from
+28 −6
Open

Do not reset tabline or statusline if they are not used #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb5b9f
Testcase: When tabline is disabled, lightline should not write to it
danhorner Jan 7, 2025
94b4844
Regularize handling of saved tabline and statusline
danhorner Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions autoload/lightline.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ function! lightline#enable() abort
endfunction

function! lightline#disable() abort
let [&statusline, &tabline] = [get(s:, '_statusline', ''), get(s:, '_tabline', '')]
if exists('s:_statusline')
let &statusline = s:_statusline
unlet s:_statusline
endif
if exists("s:_tabline")
let &tabline = s:_tabline
unlet s:_tabline
endif
for t in range(1, tabpagenr('$'))
for n in range(1, tabpagewinnr(t, '$'))
call settabwinvar(t, n, '&statusline', '')
Expand Down Expand Up @@ -172,16 +179,19 @@ function! lightline#init() abort
break
endif
endfor
if !exists('s:_statusline')
if s:lightline.enable.statusline && !exists('s:_statusline')
let s:_statusline = &statusline
endif
if !exists('s:_tabline')
let s:_tabline = &tabline
endif
if s:lightline.enable.tabline
if !exists('s:_tabline')
let s:_tabline = &tabline
endif
set tabline=%!lightline#tabline()
else
let &tabline = get(s:, '_tabline', '')
if exists("s:_tabline")
let &tabline = s:_tabline
unlet s:_tabline
endif
endif
for f in values(s:lightline.component_function)
silent! call call(f, [])
Expand Down
12 changes: 12 additions & 0 deletions test/toggle.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@ function! s:suite.toggle()
call s:assert.not_equals(&statusline, '')
call s:assert.not_equals(&tabline, '')
endfunction

function! s:suite.notab_toggle()
let g:lightline = { 'enable': { 'tabline': 0 } }
call lightline#init()
call lightline#toggle()
set tabline=ASDF
call lightline#toggle()
let check_tabline = &tabline
set tabline=
call s:assert.equals(check_tabline, 'ASDF')
endfunction