0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

patch 8.1.1768: man plugin changes setting in current window

Problem:    Man plugin changes setting in current window.
Solution:   Set options later. (Jason Franklin)
This commit is contained in:
Bram Moolenaar 2019-07-28 15:28:45 +02:00
parent f96ae0b5a2
commit bca9c30193
3 changed files with 34 additions and 8 deletions

View File

@ -174,7 +174,6 @@ func <SID>GetPage(cmdmods, ...)
else
let open_cmd = a:cmdmods . ' split'
endif
setl nonu fdc=0
endif
endif
@ -183,7 +182,7 @@ func <SID>GetPage(cmdmods, ...)
" Avoid warning for editing the dummy file twice
setl buftype=nofile noswapfile
setl ma nonu nornu nofen
setl fdc=0 ma nofen nonu nornu
silent exec "norm! 1GdG"
let unsetwidth = 0
if empty($MANWIDTH)

View File

@ -1,6 +1,6 @@
runtime ftplugin/man.vim
function Test_g_ft_man_open_mode()
func Test_g_ft_man_open_mode()
vnew
let l:h = winheight(1)
q
@ -48,9 +48,9 @@ function Test_g_ft_man_open_mode()
q
unlet g:ft_man_open_mode
endfunction
endfunc
function Test_nomodifiable()
func Test_nomodifiable()
let wincnt = winnr('$')
Man vim
if wincnt == winnr('$')
@ -59,9 +59,9 @@ function Test_nomodifiable()
endif
call assert_false(&l:modifiable)
q
endfunction
endfunc
function Test_buffer_count_hidden()
func Test_buffer_count_hidden()
%bw!
set hidden
@ -85,4 +85,29 @@ function Test_buffer_count_hidden()
q
set hidden&
endfunction
endfunc
" Check that we do not alter the settings in the initial window.
func Test_local_options()
%bw!
set foldcolumn=1 number
let wincnt = winnr('$')
Man vim
if wincnt == winnr('$')
" Vim manual page cannot be found.
return
endif
" man page
call assert_false(&nu)
call assert_equal(0, &fdc)
" initial window
wincmd p
call assert_true(&nu)
call assert_equal(1, &fdc)
%bw!
set foldcolumn& number&
endfunc

View File

@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1768,
/**/
1767,
/**/