Mercurial > vim

changeset 22834:fcbded1e3602 v8.2.1964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1964: not all ConTeXt files are recognized Commit: https://github.com/vim/vim/commit/faebda8cc1ecc4d6a197e06e968df46a2841ed79 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 6 18:52:55 2020 +0100 patch 8.2.1964: not all ConTeXt files are recognized Problem: Not all ConTeXt files are recognized. Solution: Add two patterns. (closes https://github.com/vim/vim/issues/7263)
author Bram Moolenaar <Bram@vim.org>
date Fri, 06 Nov 2020 19:00:05 +0100
parents f8e0e3939a5e
children 1cdaabe8a505
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1721,7 +1721,7 @@ au BufNewFile,BufRead *.latex,*.sty,*.dt
 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
--- 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'],
--- 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,