patch 8.2.1964: not all ConTeXt files are recognized

Problem:    Not all ConTeXt files are recognized.
Solution:   Add two patterns. (closes #7263)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b56f6125c8cbba8ebd153b5a3d0db726e100754b..a16a28d7af5636689d20cecb7d4bf27a0c316299 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1721,7 +1721,7 @@ au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl     setf tex
 au BufNewFile,BufRead *.tex                    call dist#ft#FTtex()
 
 " ConTeXt
-au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi,*.mkxl,*.mklx   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi   setf texinfo

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a7d60d7412d074177b043b24f6a9de314c8bcc54..0e5a0cd04ce4d13de3adef1c224870c99752fa22 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -110,7 +110,7 @@ let s:filename_checks = {
     \ 'conaryrecipe': ['file.recipe'],
     \ 'conf': ['auto.master'],
     \ 'config': ['configure.in', 'configure.ac', 'Pipfile', '/etc/hostname.file'],
-    \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi'],
+    \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
     \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
     \ 'crm': ['file.crm'],
     \ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],

diff --git a/src/version.c b/src/version.c
index 3ff4586760189f57b765a954999d18fa8f26f118..19f5ba29628f03b04b874e8d25b2e6d9a1c494dd 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 */
+/**/
+    1964,
 /**/
     1963,
 /**/