aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-10-15 10:12:25 +0200
committerGitHub <noreply@github.com>2022-10-15 10:12:25 +0200
commite26b48bde6e116eb288893454d2876cdad2db1f9 (patch)
treee94d6a370409ae5e34170a16cea0c2e48deb2ced
parent1c478391ca7754bf5ecb4b76c29acfa9b4978393 (diff)
downloadrneovim-e26b48bde6e116eb288893454d2876cdad2db1f9.tar.gz
rneovim-e26b48bde6e116eb288893454d2876cdad2db1f9.tar.bz2
rneovim-e26b48bde6e116eb288893454d2876cdad2db1f9.zip
vim-patch:9.0.0752: Rprofile files are not recognized (#20658)
Problem: Rprofile files are not recognized. Solution: Recognize Rprofile files as "r". (closes vim/vim#11369) https://github.com/vim/vim/commit/7e120ffccbf81ae8acac28f11fbd5eab79a1630d
-rw-r--r--runtime/filetype.vim3
-rw-r--r--runtime/lua/vim/filetype.lua3
-rw-r--r--src/nvim/testdir/test_filetype.vim2
3 files changed, 7 insertions, 1 deletions
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',
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index b637f1a16f..7669b3d82a 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -454,7 +454,7 @@ let s:filename_checks = {
\ 'ql': ['file.ql', 'file.qll'],
\ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg', 'baseq2/file.cfg', 'id1/file.cfg', 'quake1/file.cfg', 'some-baseq2/file.cfg', 'some-id1/file.cfg', 'some-quake1/file.cfg'],
\ 'quarto': ['file.qmd'],
- \ 'r': ['file.r'],
+ \ 'r': ['file.r', '.Rprofile', 'Rprofile', 'Rprofile.site'],
\ 'radiance': ['file.rad', 'file.mat'],
\ 'raku': ['file.pm6', 'file.p6', 'file.t6', 'file.pod6', 'file.raku', 'file.rakumod', 'file.rakudoc', 'file.rakutest'],
\ 'raml': ['file.raml'],