summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu, Zhenyu <wuzhenyu@ustc.edu>2024-04-08 20:26:29 +0200
committerChristian Brabandt <cb@256bit.org>2024-04-08 20:26:29 +0200
commitfc21b6437ce91368c2d53437177083b8bc375720 (patch)
tree9be02878cbae38ff43a8449b610d4d354530ae67
parentaca8f55596ee350110984c1ca5ab6c39f40bb8a6 (diff)
patch 9.1.0275: filetype: R history files are not recognizedv9.1.0275
Problem: filetype: R history files are not recognized Solution: Detect '.Rhistory' files as r filetype (Wu, Zhenyu) closes: #14440 Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 99a12d9964..b3f3c4d223 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1841,7 +1841,7 @@ else
endif
" R profile file
-au BufNewFile,BufRead .Rprofile,Rprofile,Rprofile.site setf r
+au BufNewFile,BufRead .Rhistory,.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 a26a3f08f0..6021e960c5 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -570,7 +570,7 @@ def s:GetFilenameChecks(): dict<list<string>>
qmldir: ['qmldir'],
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', '.Rprofile', 'Rprofile', 'Rprofile.site'],
+ r: ['file.r', '.Rhistory', '.Rprofile', 'Rprofile', 'Rprofile.site'],
racket: ['file.rkt', 'file.rktd', 'file.rktl'],
radiance: ['file.rad', 'file.mat'],
raku: ['file.pm6', 'file.p6', 'file.t6', 'file.pod6', 'file.raku', 'file.rakumod', 'file.rakudoc', 'file.rakutest'],
diff --git a/src/version.c b/src/version.c
index c54ec96a99..fb72324df2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 275,
+/**/
274,
/**/
273,