Mercurial > vim

changeset 32505:5bf4fd26c9ac v9.0.1584

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1584: not all meson files are recognized Commit: https://github.com/vim/vim/commit/1ba0b9e36f36926a7675b31efeda7d3e495c9157 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 27 19:01:52 2023 +0100 patch 9.0.1584: not all meson files are recognized Problem: Not all meson files are recognized. Solution: Add "meson.options". (Liam Beguin, closes https://github.com/vim/vim/issues/12444)
author Bram Moolenaar <Bram@vim.org>
date Sat, 27 May 2023 20:15:03 +0200
parents 8b7581212a5d
children fdcd3563571a
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
@@ -1270,7 +1270,7 @@ au BufNewFile,BufRead *.hgrc,*hgrc		setf
 au BufNewFile,BufRead *.mmd,*.mmdc,*.mermaid	setf mermaid
 
 " Meson Build system config
-au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+au BufNewFile,BufRead meson.build,meson.options,meson_options.txt setf meson
 au BufNewFile,BufRead *.wrap			setf dosini
 
 " Messages (logs mostly)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -370,7 +370,7 @@ let s:filename_checks = {
     \            'file.wxm', 'maxima-init.mac'],
     \ 'mel': ['file.mel'],
     \ 'mermaid': ['file.mmd', 'file.mmdc', 'file.mermaid'],
-    \ 'meson': ['meson.build', 'meson_options.txt'],
+    \ 'meson': ['meson.build', 'meson.options', 'meson_options.txt'],
     \ 'messages': ['/log/auth', '/log/cron', '/log/daemon', '/log/debug', '/log/kern', '/log/lpr', '/log/mail', '/log/messages', '/log/news/news', '/log/syslog', '/log/user',
     \     '/log/auth.log', '/log/cron.log', '/log/daemon.log', '/log/debug.log', '/log/kern.log', '/log/lpr.log', '/log/mail.log', '/log/messages.log', '/log/news/news.log', '/log/syslog.log', '/log/user.log',
     \     '/log/auth.err', '/log/cron.err', '/log/daemon.err', '/log/debug.err', '/log/kern.err', '/log/lpr.err', '/log/mail.err', '/log/messages.err', '/log/news/news.err', '/log/syslog.err', '/log/user.err',
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1584,
+/**/
     1583,
 /**/
     1582,