patch 8.2.2625: rss files not recognized

Problem:    Rss files not recognized.
Solution:   Recognize .rss as XML. (Kivin Locke, closes #7987)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e907630b4ef891723ade0ace958b56e2cc0683e1..2b6627427b63e902df95485fbd087f37b0262492 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1397,6 +1397,9 @@ else
   au BufNewFile,BufRead *.rmd,*.smd                    setf rmd
 endif
 
+" RSS looks like XML
+au BufNewFile,BufRead *.rss                            setf xml
+
 " R reStructuredText file
 if has("fname_case")
   au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst    setf rrst

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 16237122dcafab1d800fe99e729c0bc6e8bc1d3f..05ea8e3974deabc1e8669e879bb7caf872b71b17 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -538,7 +538,7 @@ let s:filename_checks = {
     \ 'xhtml': ['file.xhtml', 'file.xht'],
     \ 'xinetd': ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf', 'any/etc/xinetd.d/file'],
     \ 'xmath': ['file.msc', 'file.msf'],
-    \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl', 'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu', 'file.atom'],
+    \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl', 'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu', 'file.atom', 'file.rss'],
     \ 'xmodmap': ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap', 'some-xmodmap-file', 'xmodmap', 'xmodmap-file'],
     \ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
     \ 'xpm2': ['file.xpm2'],

diff --git a/src/version.c b/src/version.c
index b219b582e5cdc92cbe78d41b7801f967b707036b..36547d0e8f08bfbaa95e6574eff4f4b1f92c6f75 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2625,
 /**/
     2624,
 /**/