Mercurial > vim
comparison runtime/syntax/r.vim @ 9975:03fa8a51e9dc
commit https://github.com/vim/vim/commit/e4a3bcf28d92d0bde9ca227ccb40d401038185e5
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 26 19:52:37 2016 +0200
Updated runtime files. Add Scala files.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 26 Aug 2016 20:00:12 +0200 |
parents | da01d5da2cfa |
children | 4aae8146c21f |
comparison
equal
deleted
inserted
replaced
9974:cb480e05fb5f | 9975:03fa8a51e9dc |
---|---|
3 " Maintainer: Jakson Aquino <jalvesaq@gmail.com> | 3 " Maintainer: Jakson Aquino <jalvesaq@gmail.com> |
4 " Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com> | 4 " Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com> |
5 " Tom Payne <tom@tompayne.org> | 5 " Tom Payne <tom@tompayne.org> |
6 " Contributor: Johannes Ranke <jranke@uni-bremen.de> | 6 " Contributor: Johannes Ranke <jranke@uni-bremen.de> |
7 " Homepage: https://github.com/jalvesaq/R-Vim-runtime | 7 " Homepage: https://github.com/jalvesaq/R-Vim-runtime |
8 " Last Change: Thu Mar 10, 2016 12:26PM | 8 " Last Change: Thu Aug 25, 2016 08:52PM |
9 " Filenames: *.R *.r *.Rhistory *.Rt | 9 " Filenames: *.R *.r *.Rhistory *.Rt |
10 " | 10 " |
11 " NOTE: The highlighting of R functions is defined in | 11 " NOTE: The highlighting of R functions is defined in |
12 " runtime files created by a filetype plugin, if installed. | 12 " runtime files created by a filetype plugin, if installed. |
13 " | 13 " |
24 | 24 |
25 if exists("b:current_syntax") | 25 if exists("b:current_syntax") |
26 finish | 26 finish |
27 endif | 27 endif |
28 | 28 |
29 setlocal iskeyword=@,48-57,_,. | 29 syn iskeyword @,48-57,_,. |
30 | 30 |
31 if exists("g:r_syntax_folding") && g:r_syntax_folding | 31 if exists("g:r_syntax_folding") && g:r_syntax_folding |
32 setlocal foldmethod=syntax | 32 setlocal foldmethod=syntax |
33 endif | 33 endif |
34 if !exists("g:r_hl_roxygen") | 34 if !exists("g:r_hl_roxygen") |
172 let g:R_hi_fun = 1 | 172 let g:R_hi_fun = 1 |
173 endif | 173 endif |
174 if g:R_hi_fun | 174 if g:R_hi_fun |
175 " Nvim-R: | 175 " Nvim-R: |
176 runtime R/functions.vim | 176 runtime R/functions.vim |
177 " Vim-R-plugin: | |
178 runtime r-plugin/functions.vim | |
179 endif | 177 endif |
180 | 178 |
181 syn match rDollar display contained "\$" | 179 syn match rDollar display contained "\$" |
182 syn match rDollar display contained "@" | 180 syn match rDollar display contained "@" |
183 | 181 |