diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-05-27 19:01:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-27 19:01:52 +0100 |
| commit | 1ba0b9e36f36926a7675b31efeda7d3e495c9157 (patch) | |
| tree | 18c82dcb1b16527998e18a3e8194b6b5cb64fef0 | |
| parent | 3a2a60ce4a8e73594bca16814672fcc243d093ac (diff) | |
patch 9.0.1584: not all meson files are recognizedv9.0.1584
Problem: Not all meson files are recognized.
Solution: Add "meson.options". (Liam Beguin, closes #12444)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 2f446a1aa2..c0b914d3a8 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1270,7 +1270,7 @@ au BufNewFile,BufRead *.hgrc,*hgrc setf cfg 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) diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index d2160ecf03..c2b4cc790e 100644 --- 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', diff --git a/src/version.c b/src/version.c index 19fc37fd53..b23d0667cb 100644 --- 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, |