diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-16 23:28:48 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-16 23:28:48 +1200 |
commit | 39bac9a74ebaaf6e1ee6fc2c51cda9c640498d93 (patch) | |
tree | 0aad276e7df88d04dbdaa925180128d7a0a8ee99 /vim/after/ftplugin | |
parent | Merge branch 'release/v1.54.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-39bac9a74ebaaf6e1ee6fc2c51cda9c640498d93.tar.gz dotfiles-39bac9a74ebaaf6e1ee6fc2c51cda9c640498d93.zip |
Merge branch 'release/v1.55.0'v1.55.0
* release/v1.55.0:
Bump VERSION
Add explanatory README to vim/plugin directory
Update new Vim plugins
Spin equalalways_resized.vim into its own dist
Spin foldlevelstart_stdin.vim into its own dist
Work around buggy old Vim 'help' ftplugin undo
Don't set vint compiler for commandline windows
Revert "Set gitconfig commit.verbose, clear com...
Qualify unmap with version number guard
Add a comment
Spin out scroll_next.vim into its own dist
Use <PageDown> rather than <C-F> in mapping
Reorder .vimrc a bit
Remove Unix 'backupskip' parts if not running Unix
Diffstat (limited to 'vim/after/ftplugin')
-rw-r--r-- | vim/after/ftplugin/help.vim | 6 | ||||
-rw-r--r-- | vim/after/ftplugin/sh.vim | 1 | ||||
-rw-r--r-- | vim/after/ftplugin/vim.vim | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/vim/after/ftplugin/help.vim b/vim/after/ftplugin/help.vim index db621315..71ad3a8d 100644 --- a/vim/after/ftplugin/help.vim +++ b/vim/after/ftplugin/help.vim @@ -3,6 +3,12 @@ if &filetype !=# 'help' || v:version < 700 finish endif +" This variable had the wrong name before Vim 7.1 +if v:version == 700 && exists('b:undo_plugin') + let b:undo_ftplugin = b:undo_plugin + unlet b:undo_plugin +endif + " If the buffer is modifiable and writable, we're writing documentation, not " reading it; don't conceal characters if has('conceal') && &modifiable && !&readonly diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 475527b9..766994b7 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -27,6 +27,7 @@ let b:undo_ftplugin .= '|unlet b:current_compiler b:sh_check_compiler' \ . '|setlocal errorformat< makeprg<' " Resort to g:is_posix for correct syntax on older runtime files +" 8.1.257 updated the runtime files to include a fix for this if exists('b:is_posix') \ && (v:version < 800 || v:version == 800 && !has('patch257')) let g:is_posix = 1 diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim index bfac623a..46182627 100644 --- a/vim/after/ftplugin/vim.vim +++ b/vim/after/ftplugin/vim.vim @@ -4,9 +4,11 @@ if &filetype !=# 'vim' || v:version < 700 || &compatible endif " Use Vint as a syntax checker -compiler vint -let b:undo_ftplugin .= '|unlet b:current_compiler' - \ . '|setlocal errorformat< makeprg<' +if bufname('%') !=# 'command-line' + compiler vint + let b:undo_ftplugin .= '|unlet b:current_compiler' + \ . '|setlocal errorformat< makeprg<' +endif " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_vim_maps') @@ -19,7 +21,9 @@ nnoremap <buffer> <LocalLeader>K let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>K' " Get rid of the core ftplugin's square-bracket maps on unload -let b:undo_ftplugin .= '|nunmap <buffer> [[' +" 8.1.273 updated the runtime files to include a fix for this +if v:version < 801 || v:version == 801 && !has('patch273') + let b:undo_ftplugin .= '|nunmap <buffer> [[' \ . '|vunmap <buffer> [[' \ . '|nunmap <buffer> ]]' \ . '|vunmap <buffer> ]]' @@ -31,3 +35,4 @@ let b:undo_ftplugin .= '|nunmap <buffer> [[' \ . '|vunmap <buffer> ]"' \ . '|nunmap <buffer> ["' \ . '|vunmap <buffer> ["' +endif |