diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-29 08:54:38 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-04-29 09:27:19 -0400 |
| commit | 0a0034718c00fd9f434d20d29e415287db284bbe (patch) | |
| tree | 8d99d94c42772a4c39acf059745609b85d596974 /runtime/ftplugin | |
| parent | 27fb03f5a03db6738967f9e0e0ea85ea0fab7592 (diff) | |
| download | rneovim-0a0034718c00fd9f434d20d29e415287db284bbe.tar.gz rneovim-0a0034718c00fd9f434d20d29e415287db284bbe.tar.bz2 rneovim-0a0034718c00fd9f434d20d29e415287db284bbe.zip | |
vim-patch:2547aa930b59
Update runtime files.
https://github.com/vim/vim/commit/2547aa930b59f5e2bcb70e81d5a57ed461e59b4f
Omit modifyOtherKeys, vim9, vim.man.
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/cpp.vim | 9 | ||||
| -rw-r--r-- | runtime/ftplugin/diff.vim | 5 | ||||
| -rw-r--r-- | runtime/ftplugin/vim.vim | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim index 8c3f211da8..f9d31cbec3 100644 --- a/runtime/ftplugin/cpp.vim +++ b/runtime/ftplugin/cpp.vim @@ -1,12 +1,17 @@ " Vim filetype plugin file " Language: C++ " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2001 Jan 15 +" Last Change: 2020 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") finish endif -" Behaves just like C +" Behaves mostly just like C runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim + +" C++ uses templates with <things> +" Disabled, because it gives an error for typing an unmatched ">". +" set matchpairs+=<:> +" let b:undo_ftplugin ..= ' | setl matchpairs<' diff --git a/runtime/ftplugin/diff.vim b/runtime/ftplugin/diff.vim index 3fe1b84a04..0464290475 100644 --- a/runtime/ftplugin/diff.vim +++ b/runtime/ftplugin/diff.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Diff " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2005 Jul 27 +" Last Change: 2020 Jul 18 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -13,3 +13,6 @@ let b:undo_ftplugin = "setl modeline<" " Don't use modelines in a diff, they apply to the diffed file setlocal nomodeline + +" If there are comments they start with # +let &commentstring = "# %s" diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index 1009292788..ee189e39c0 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2020 Jul 06 +" Last Change: 2020 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -86,7 +86,7 @@ endif if exists("loaded_matchit") let b:match_ignorecase = 0 let b:match_words = - \ '\<\%(fu\%[nction]\|def\)\>:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . + \ '\<\%(fu\%[nction]\|def\)\>[^(]:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' . \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . \ '{:},' . |