summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2022-10-14 20:24:24 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-14 20:24:24 +0100
commit7e120ffccbf81ae8acac28f11fbd5eab79a1630d (patch)
treeb14cd154c0448c72a91dd3a42178759529f25aac
parentc9121f798f49fa71e814912cb186d89c164090c3 (diff)
downloadvim-git-7e120ffccbf81ae8acac28f11fbd5eab79a1630d.tar.gz
patch 9.0.0752: Rprofile files are not recognizedv9.0.0752
Problem: Rprofile files are not recognized. Solution: Recognize Rprofile files as "r". (closes #11369)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b4bcc8012..d36078223 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1628,6 +1628,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/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 17d846df8..0fb73b7df 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -453,7 +453,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'],
diff --git a/src/version.c b/src/version.c
index 34129a245..bedbdc045 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 752,
+/**/
751,
/**/
750,