diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-04-01 21:05:38 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-04-01 21:05:38 +1300 |
| commit | dd1b9b2e1ba1ee926400de248a2d9edce8378eaf (patch) | |
| tree | ff3b4e4e7cb11216a8d2c7d2a984186fdfda3f61 /vim | |
| parent | Merge branch 'release/v4.17.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-77945df5a11bc39766823ef5d66a1484fe69dfb2.tar.gz (sig) dotfiles-77945df5a11bc39766823ef5d66a1484fe69dfb2.zip | |
Merge branch 'release/v4.18.0'v4.18.0
* release/v4.18.0:
Bump VERSION
Set 'keywordprg' to :help for older Vims
Fix up a few cosmetic shell anti-patterns
Remove unneeded leading pipe from b:undo_ftplugin
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/after/ftplugin/vim.vim | 7 | ||||
| -rw-r--r-- | vim/ftplugin/textarea.vim | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim index 905d21dc..d2fa77e2 100644 --- a/vim/after/ftplugin/vim.vim +++ b/vim/after/ftplugin/vim.vim @@ -9,6 +9,13 @@ endif let b:regex_escape_flavor = 'vim' let b:undo_ftplugin .= '|unlet b:regex_escape_flavor' +" Use :help as 'keywordprg' if not already set; this is the default since Vim +" v8.1.1290 +if &keywordprg !=# ':help' + setlocal keywordprg=:help + let b:undo_ftplugin .= '|setlocal keywordprg<' +endif + " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_vim_maps') finish diff --git a/vim/ftplugin/textarea.vim b/vim/ftplugin/textarea.vim index b5c5ca98..7877c8db 100644 --- a/vim/ftplugin/textarea.vim +++ b/vim/ftplugin/textarea.vim @@ -7,4 +7,4 @@ endif " areas I edit using TextEditorAnywhere nnoremap <buffer> <LocalLeader>f \ :<C-U>setlocal filetype=mail<CR> -let b:undo_ftplugin = '|nunmap <buffer> <LocalLeader>f' +let b:undo_ftplugin = 'nunmap <buffer> <LocalLeader>f' |