patch 9.1.0275: filetype: R history files are not recognized

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>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 99a12d99642f0b669c1aa9107378fbf0932fe778..b3f3c4d223d1864e4901e8bd8c85325ca5c29556 100644 (file)
--- 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 a26a3f08f00b1b4ce2245b67922d254b39923448..6021e960c5b04c43f10819294178edac43aae650 100644 (file)
--- 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 c54ec96a993c771ce8d1c0b8573f782c6753f984..fb72324df2600d643d2a02caa47c957709f29770 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    275,
 /**/
     274,
 /**/