aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-05-28 11:47:07 +0200
committerGitHub <noreply@github.com>2023-05-28 11:47:07 +0200
commit8e17054a2333318340f23abd7a94abfe474fb52f (patch)
tree25d2f48a2982d1e5ea85e5d9d2e7d8a9a3cb9252
parent9c41a81dec15ced3f66723b8aa87c2438a099128 (diff)
downloadrneovim-8e17054a2333318340f23abd7a94abfe474fb52f.tar.gz
rneovim-8e17054a2333318340f23abd7a94abfe474fb52f.tar.bz2
rneovim-8e17054a2333318340f23abd7a94abfe474fb52f.zip
vim-patch:9.0.1584: not all meson files are recognized (#23797)
Problem: Not all meson files are recognized. Solution: Add "meson.options". (Liam Beguin, closes vim/vim#12444) https://github.com/vim/vim/commit/1ba0b9e36f36926a7675b31efeda7d3e495c9157 Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1b04666161..57df621153 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1547,6 +1547,7 @@ local filename = {
['man.config'] = 'manconf',
['maxima-init.mac'] = 'maxima',
['meson.build'] = 'meson',
+ ['meson.options'] = 'meson',
['meson_options.txt'] = 'meson',
['/etc/conf.modules'] = 'modconf',
['/etc/modules'] = 'modconf',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 2858bf1add..9ee9a1862e 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/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',