patch 8.2.2624: atom files not recognized

Problem:    Atom files not recognized.
Solution:   Recognize .atom as XML. (Kivin Locke, closes #7986)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 1a18a651e0529909c6601488d17ac78611236280..e907630b4ef891723ade0ace958b56e2cc0683e1 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -168,6 +168,9 @@ au BufNewFile,BufRead *.mar                 setf vmasm
 " Atlas
 au BufNewFile,BufRead *.atl,*.as               setf atlas
 
+" Atom is based on XML
+au BufNewFile,BufRead *.atom                   setf xml
+
 " Autoit v3
 au BufNewFile,BufRead *.au3                    setf autoit
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 11b6baeb8314bf39673265598272472990256935..16237122dcafab1d800fe99e729c0bc6e8bc1d3f 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'],
+    \ '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'],
     \ '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 117dacc6a89e7aa72454b295a396b653a731acda..b219b582e5cdc92cbe78d41b7801f967b707036b 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 */
+/**/
+    2624,
 /**/
     2623,
 /**/