summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-06 18:52:55 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-06 18:52:55 +0100
commitfaebda8cc1ecc4d6a197e06e968df46a2841ed79 (patch)
tree56d8143d02a686eb0aad498a324155878d109786
parent927495b1fef835a8f83c089bb3aa3608b617e972 (diff)
downloadvim-git-faebda8cc1ecc4d6a197e06e968df46a2841ed79.tar.gz
patch 8.2.1964: not all ConTeXt files are recognizedv8.2.1964
Problem: Not all ConTeXt files are recognized. Solution: Add two patterns. (closes #7263)
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b56f6125c..a16a28d7a 100644
--- 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 a7d60d741..0e5a0cd04 100644
--- 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 3ff458676..19f5ba296 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1964,
+/**/
1963,
/**/
1962,