diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-10 08:10:15 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-10 08:10:15 +0800 |
| commit | 465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77 (patch) | |
| tree | edae38568202ba41dee4a49f78884da313fd114b /runtime/ftplugin | |
| parent | 1514cdc7d8863eeee6b04883b1c50aac40048b49 (diff) | |
| parent | 6725667d31591e8025589c4c1df34469f3bfdb52 (diff) | |
| download | rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.gz rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.bz2 rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/help.vim | 5 | ||||
| -rw-r--r-- | runtime/ftplugin/vim.vim | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/runtime/ftplugin/help.vim b/runtime/ftplugin/help.vim index c94b2ef3eb..9d2361b413 100644 --- a/runtime/ftplugin/help.vim +++ b/runtime/ftplugin/help.vim @@ -11,13 +11,16 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo&vim -let b:undo_ftplugin = "setl fo< tw< cole< cocu<" +let b:undo_ftplugin = "setl fo< tw< cole< cocu< keywordprg<" setlocal formatoptions+=tcroql textwidth=78 if has("conceal") setlocal cole=2 cocu=nc endif +" Prefer Vim help instead of manpages. +setlocal keywordprg=:help + if !exists('g:no_plugin_maps') function! s:show_toc() abort let bufname = bufname('%') diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index f355d2837d..ba9ed76169 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -14,7 +14,7 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo-=C -let b:undo_ftplugin = "setl fo< isk< com< tw< commentstring<" +let b:undo_ftplugin = "setl fo< isk< com< tw< commentstring< keywordprg<" \ . "| unlet! b:match_ignorecase b:match_words b:match_skip" " Set 'formatoptions' to break comment lines but not other lines, @@ -36,6 +36,9 @@ endif " Comments start with a double quote setlocal commentstring=\"%s +" Prefer Vim help instead of manpages. +setlocal keywordprg=:help + " Move around functions. nnoremap <silent><buffer> [[ m':call search('^\s*fu\%[nction]\>', "bW")<CR> vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR> |