diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-09-25 22:39:15 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-09-25 22:39:15 -0400 |
| commit | eaff0072e5e0c136628c4cc04097a9ad6a56c31c (patch) | |
| tree | a9bbff0a65293d5c46f9e14deb5f7b1150a23fa1 | |
| parent | e073074414f2000c1b4bb291ad3ece33958a427f (diff) | |
| parent | 399864dc28498496bb82cdeb7b4aeae935cd667d (diff) | |
| download | rneovim-eaff0072e5e0c136628c4cc04097a9ad6a56c31c.tar.gz rneovim-eaff0072e5e0c136628c4cc04097a9ad6a56c31c.tar.bz2 rneovim-eaff0072e5e0c136628c4cc04097a9ad6a56c31c.zip | |
Merge pull request #3394 from justinmk/man.vim
man.vim
| -rw-r--r-- | runtime/autoload/man.vim | 15 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index cfd0d35a71..d481d9eaf0 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -48,8 +48,9 @@ function man#get_page(...) abort exec 'let s:man_tag_col_'.s:man_tag_depth.' = '.col('.') let s:man_tag_depth = s:man_tag_depth + 1 - " Use an existing "man" window if it exists, otherwise open a new one. - if !invoked_from_man + let editcmd = 'edit' + " Use an existing 'man' window, else open a new one. + if &filetype !=# 'man' let thiswin = winnr() wincmd b if winnr() > 1 @@ -64,13 +65,13 @@ function man#get_page(...) abort endif endwhile endif - if !invoked_from_man - tabnew - let invoked_from_man = 1 + + if &filetype !=# 'man' + let editcmd = 'tabnew' endif endif - silent exec 'edit man://'.page.(empty(sect)?'':'('.sect.')') + silent exec editcmd.' man://'.page.(empty(sect)?'':'('.sect.')') setlocal modifiable silent keepjumps norm! 1G"_dG @@ -86,7 +87,7 @@ function man#get_page(...) abort setlocal nomodified setlocal filetype=man - if invoked_from_man + if invoked_from_man || editcmd ==# 'tabnew' call s:set_window_local_options() endif endfunction diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 38b55e6a83..133a28e626 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -2,6 +2,10 @@ " Language: man " Maintainer: SungHyun Nam <goweol@gmail.com> +if has('vim_starting') && &filetype !=# 'man' + finish +endif + " Only do this when not done yet for this buffer if exists('b:did_ftplugin') finish |