To: vim_dev@googlegroups.com
Subject: Patch 9.0.1584
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1584
Problem:    Not all meson files are recognized.
Solution:   Add "meson.options". (Liam Beguin, closes #12444)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.1583/runtime/filetype.vim	2023-05-18 16:42:13.663307704 +0100
--- runtime/filetype.vim	2023-05-27 18:57:56.299408498 +0100
***************
*** 1270,1276 ****
  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 *.wrap			setf dosini
  
  " Messages (logs mostly)
--- 1270,1276 ----
  au BufNewFile,BufRead *.mmd,*.mmdc,*.mermaid	setf mermaid
  
  " Meson Build system config
! au BufNewFile,BufRead meson.build,meson.options,meson_options.txt setf meson
  au BufNewFile,BufRead *.wrap			setf dosini
  
  " Messages (logs mostly)
*** ../vim-9.0.1583/src/testdir/test_filetype.vim	2023-05-19 21:40:57.854218815 +0100
--- src/testdir/test_filetype.vim	2023-05-27 18:58:42.903375559 +0100
***************
*** 370,376 ****
      \            'file.wxm', 'maxima-init.mac'],
      \ 'mel': ['file.mel'],
      \ 'mermaid': ['file.mmd', 'file.mmdc', 'file.mermaid'],
!     \ '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',
--- 370,376 ----
      \            'file.wxm', 'maxima-init.mac'],
      \ 'mel': ['file.mel'],
      \ 'mermaid': ['file.mmd', 'file.mmdc', 'file.mermaid'],
!     \ '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',
*** ../vim-9.0.1583/src/version.c	2023-05-27 18:02:50.192062438 +0100
--- src/version.c	2023-05-27 18:59:39.699333432 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1584,
  /**/

-- 
From "know your smileys":
 ;-0	Can't find shift key
 ,-9	Kann Umschalttaste nicht finden

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///