diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-19 23:16:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 23:16:36 -0400 |
| commit | 2fb46adc5e19a0f85deed3983a3b956c31504adf (patch) | |
| tree | a971e87f03a42c0f8f33c7bdf481f5b3605a8795 /runtime/ftplugin/rmd.vim | |
| parent | 462c53eb3ea256bb85eb3916400d984347f0626f (diff) | |
| parent | b25fa94eb5234e3c5ae1f7b3c0888aac644ae923 (diff) | |
| download | rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.tar.gz rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.tar.bz2 rneovim-2fb46adc5e19a0f85deed3983a3b956c31504adf.zip | |
Merge pull request #6531 from justinmk/vim-dc1f1645cb49
vim-patch: runtime updates
Diffstat (limited to 'runtime/ftplugin/rmd.vim')
| -rw-r--r-- | runtime/ftplugin/rmd.vim | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim index ec64a07675..8c092ac13f 100644 --- a/runtime/ftplugin/rmd.vim +++ b/runtime/ftplugin/rmd.vim @@ -1,9 +1,9 @@ " Vim filetype plugin file -" Language: R help file +" Language: R Markdown file " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Homepage: https://github.com/jalvesaq/R-Vim-runtime -" Last Change: Tue Apr 07, 2015 04:37PM -" Original work by Alex Zvoleff (adjusted for rmd by Michel Kuhlmann) +" Last Change: Mon Jun 06, 2016 09:41PM +" Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann) " Only do this when not yet done for this buffer if exists("b:did_ftplugin") @@ -12,6 +12,16 @@ endif runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim +" Nvim-R plugin needs this +if exists("*CompleteR") + if &omnifunc == "CompleteR" + let b:rplugin_nonr_omnifunc = "" + else + let b:rplugin_nonr_omnifunc = &omnifunc + endif + set omnifunc=CompleteR +endif + setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s setlocal formatoptions+=tcqln setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+ |