diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-26 11:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 11:01:10 +0200 |
| commit | 469726d3c5ae2b1db2366625d07f830e68ed1e05 (patch) | |
| tree | 5d83973b94aa810e23ebbd9353476a74592508d4 /runtime | |
| parent | 8b263c7a6868105adae69f001899c5837b302bef (diff) | |
| parent | 2d6c91ab9954c2f3be27c7eefaaa498d91e557be (diff) | |
| download | rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.tar.gz rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.tar.bz2 rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.zip | |
Merge #10340 from janlazo/vim-8.1.1593
vim-patch:8.0.1688,8.1.1593
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/scripts.vim | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim index ab66c0c0a1..8d460cd317 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -195,7 +195,7 @@ else if s:line1 =~# '^:$' call dist#ft#SetFileTypeSH(s:line1) " defined in filetype.vim - " Z shell scripts + " Z shell scripts elseif s:line1 =~# '^#compdef\>' || s:line1 =~# '^#autoload\>' || \ "\n".s:line1."\n".s:line2."\n".s:line3."\n".s:line4."\n".s:line5 =~# '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>' set ft=zsh @@ -204,15 +204,20 @@ else elseif s:line1 =~# '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$' set ft=mail - " Mason + " Mason elseif s:line1 =~# '^<[%&].*>' set ft=mason - " Vim scripts (must have '" vim' as the first line to trigger this) + " Vim scripts (must have '" vim' as the first line to trigger this) elseif s:line1 =~# '^" *[vV]im$' set ft=vim - " MOO + " libcxx and libstdc++ standard library headers like "iostream" do not have + " an extension, recognize the Emacs file mode. + elseif s:line1 =~? '-\*-.*C++.*-\*-' + set ft=cpp + + " MOO elseif s:line1 =~# '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$' set ft=moo |