diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-18 22:09:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-18 22:09:34 +0200 |
| commit | c3bf7b56f2703e2d6f36dfb05fd32b5b43ce3c3f (patch) | |
| tree | b631eef38014ef0c64d84effff6578873d02f42b | |
| parent | 89577b3b3e559d6ed8467b8e756f86f9f9607cae (diff) | |
patch 8.1.2175: meson files are not recognizedv8.1.2175
Problem: Meson files are not recognized.
Solution: Add the meson filetype. (Liam Beguin , Nirbheek Chauhan,
closes #5056) Also recognize hollywood.
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9af37ad2a8..a27dc41953 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -979,6 +979,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 19fd19a9ac..736dc79ebf 100644 --- a/src/testdir/test_filetype.vim +++ b/src/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'], @@ -274,6 +275,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', diff --git a/src/version.c b/src/version.c index e2e213e9f3..e371d68dbf 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2175, +/**/ 2174, /**/ 2173, |