From fc21b6437ce91368c2d53437177083b8bc375720 Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Mon, 8 Apr 2024 20:26:29 +0200 Subject: 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 Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 2 +- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 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> 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 @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 275, /**/ 274, /**/ -- cgit v1.2.3