diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/dev_style.txt | 7 | ||||
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/runtime/doc/dev_style.txt b/runtime/doc/dev_style.txt index 6d832219f6..733b9c50c3 100644 --- a/runtime/doc/dev_style.txt +++ b/runtime/doc/dev_style.txt @@ -181,13 +181,6 @@ Use `bool` to represent boolean values. > int loaded = 1; // BAD: loaded should have type bool. -Variable declarations ~ - -Declare only one variable per line. > - - int i, j = 1 - - Conditions ~ Don't use "yoda-conditions". Use at most one assignment per condition. > diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 8abec398db..8dfecfbdcc 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1629,6 +1629,9 @@ else au BufNewFile,BufRead *.rmd,*.smd setf rmd endif +" R profile file +au BufNewFile,BufRead .Rprofile,Rprofile,Rprofile.site setf r + " RSS looks like XML au BufNewFile,BufRead *.rss setf xml diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index ea39f66393..d2840b3a7e 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -1540,6 +1540,9 @@ local filename = { ['.pythonstartup'] = 'python', ['.pythonrc'] = 'python', SConstruct = 'python', + ['.Rprofile'] = 'r', + ['Rprofile'] = 'r', + ['Rprofile.site'] = 'r', ratpoisonrc = 'ratpoison', ['.ratpoisonrc'] = 'ratpoison', inputrc = 'readline', |