diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-18 23:20:15 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-10-18 23:23:14 -0400 |
commit | 1e4a9f9993a26a1495d1a3bdfd80fe079127ba83 (patch) | |
tree | 7b73ca3f0e717e9740ff77bde4f8d8fa27001719 | |
parent | 6c6abd11f75052d8bbc1a3ff279aab61ed0bca58 (diff) | |
download | rneovim-1e4a9f9993a26a1495d1a3bdfd80fe079127ba83.tar.gz rneovim-1e4a9f9993a26a1495d1a3bdfd80fe079127ba83.tar.bz2 rneovim-1e4a9f9993a26a1495d1a3bdfd80fe079127ba83.zip |
vim-patch:8.1.2175: meson files are not recognized
Problem: Meson files are not recognized.
Solution: Add the meson filetype. (Liam Beguin , Nirbheek Chauhan,
closes vim/vim#5056) Also recognize hollywood.
https://github.com/vim/vim/commit/c3bf7b56f2703e2d6f36dfb05fd32b5b43ce3c3f
-rw-r--r-- | runtime/filetype.vim | 3 | ||||
-rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6abf9da55f..bbf9a91e2d 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -975,6 +975,9 @@ au BufNewFile,BufRead hg-editor-*.txt setf hgcommit " Mercurial config (looks like generic config file) au BufNewFile,BufRead *.hgrc,*hgrc setf cfg +" Meson Build system config +au BufNewFile,BufRead meson.build,meson_options.txt setf meson + " Messages (logs mostly) au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 7512d599b8..8e76046b13 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -201,6 +201,7 @@ let s:filename_checks = { \ 'hex': ['file.hex', 'file.h32'], \ 'hgcommit': ['hg-editor-file.txt'], \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'], + \ 'hollywood': ['file.hws'], \ 'hostconf': ['/etc/host.conf'], \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny'], \ 'template': ['file.tmpl'], @@ -273,6 +274,7 @@ let s:filename_checks = { \ 'mason': ['file.mason', 'file.mhtml', 'file.comp'], \ 'master': ['file.mas', 'file.master'], \ 'mel': ['file.mel'], + \ 'meson': ['meson.build', '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', |