mirror of
				https://github.com/vim/vim.git
				synced 2025-10-31 09:57:14 -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:
		| @@ -174,7 +174,6 @@ func <SID>GetPage(cmdmods, ...) | |||||||
|       else |       else | ||||||
| 	let open_cmd = a:cmdmods . ' split' | 	let open_cmd = a:cmdmods . ' split' | ||||||
|       endif |       endif | ||||||
|       setl nonu fdc=0 |  | ||||||
|     endif |     endif | ||||||
|   endif |   endif | ||||||
|  |  | ||||||
| @@ -183,7 +182,7 @@ func <SID>GetPage(cmdmods, ...) | |||||||
|   " Avoid warning for editing the dummy file twice |   " Avoid warning for editing the dummy file twice | ||||||
|   setl buftype=nofile noswapfile |   setl buftype=nofile noswapfile | ||||||
|  |  | ||||||
|   setl ma nonu nornu nofen |   setl fdc=0 ma nofen nonu nornu | ||||||
|   silent exec "norm! 1GdG" |   silent exec "norm! 1GdG" | ||||||
|   let unsetwidth = 0 |   let unsetwidth = 0 | ||||||
|   if empty($MANWIDTH) |   if empty($MANWIDTH) | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| runtime ftplugin/man.vim | runtime ftplugin/man.vim | ||||||
|  |  | ||||||
| function Test_g_ft_man_open_mode() | func Test_g_ft_man_open_mode() | ||||||
|   vnew |   vnew | ||||||
|   let l:h = winheight(1) |   let l:h = winheight(1) | ||||||
|   q |   q | ||||||
| @@ -48,9 +48,9 @@ function Test_g_ft_man_open_mode() | |||||||
|   q |   q | ||||||
|  |  | ||||||
|   unlet g:ft_man_open_mode |   unlet g:ft_man_open_mode | ||||||
| endfunction | endfunc | ||||||
|  |  | ||||||
| function Test_nomodifiable() | func Test_nomodifiable() | ||||||
|   let wincnt = winnr('$') |   let wincnt = winnr('$') | ||||||
|   Man vim |   Man vim | ||||||
|   if wincnt == winnr('$') |   if wincnt == winnr('$') | ||||||
| @@ -59,9 +59,9 @@ function Test_nomodifiable() | |||||||
|   endif |   endif | ||||||
|   call assert_false(&l:modifiable) |   call assert_false(&l:modifiable) | ||||||
|   q |   q | ||||||
| endfunction | endfunc | ||||||
|  |  | ||||||
| function Test_buffer_count_hidden() | func Test_buffer_count_hidden() | ||||||
|   %bw! |   %bw! | ||||||
|   set hidden |   set hidden | ||||||
|  |  | ||||||
| @@ -85,4 +85,29 @@ function Test_buffer_count_hidden() | |||||||
|   q |   q | ||||||
|  |  | ||||||
|   set hidden& |   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 | ||||||
|   | |||||||
| @@ -777,6 +777,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     1768, | ||||||
| /**/ | /**/ | ||||||
|     1767, |     1767, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user