To: vim_dev@googlegroups.com Subject: Patch 8.1.2175 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2175 Problem: Meson files are not recognized. Solution: Add the meson filetype. (Liam Beguin , Nirbheek Chauhan, closes #5056) Also recognize hollywood. Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.1.2174/runtime/filetype.vim 2019-08-26 21:27:50.533526608 +0200 --- runtime/filetype.vim 2019-10-18 22:03:05.161090010 +0200 *************** *** 701,706 **** --- 701,709 ---- " HEX (Intel) au BufNewFile,BufRead *.hex,*.h32 setf hex + " Hollywood + au BufRead,BufNewFile *.hws setf hollywood + " Tilde (must be before HTML) au BufNewFile,BufRead *.t.html setf tilde *************** *** 976,981 **** --- 979,987 ---- " 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 *** ../vim-8.1.2174/src/testdir/test_filetype.vim 2019-08-26 21:27:50.533526608 +0200 --- src/testdir/test_filetype.vim 2019-10-18 22:07:56.307167106 +0200 *************** *** 201,206 **** --- 201,207 ---- \ '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,279 **** --- 275,281 ---- \ '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', *** ../vim-8.1.2174/src/version.c 2019-10-18 21:26:01.607768532 +0200 --- src/version.c 2019-10-18 22:05:55.784415384 +0200 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2175, /**/ -- We apologise again for the fault in the subtitles. Those responsible for sacking the people who have just been sacked have been sacked. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///