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

Patch 8.2.3730
Problem:    "/etc/Muttrc.d/README" gets filetype muttrc.
Solution:   Move the Muttrc.d pattern down, add exception for *.rc files.
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.3729/runtime/filetype.vim	2021-12-03 17:44:23.524803527 +0000
--- runtime/filetype.vim	2021-12-03 19:20:05.324101348 +0000
***************
*** 1123,1136 ****
  " Mysql
  au BufNewFile,BufRead *.mysql			setf mysql
  
- " Mutt setup files (must be before catch *.rc)
- au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
- 
  " Tcl Shell RC file
  au BufNewFile,BufRead tclsh.rc			setf tcl
  
  " M$ Resource files
! au BufNewFile,BufRead *.rc,*.rch		setf rc
  
  " MuPAD source
  au BufRead,BufNewFile *.mu			setf mupad
--- 1123,1137 ----
  " Mysql
  au BufNewFile,BufRead *.mysql			setf mysql
  
  " Tcl Shell RC file
  au BufNewFile,BufRead tclsh.rc			setf tcl
  
  " M$ Resource files
! " /etc/Muttrc.d/file.rc is muttrc
! au BufNewFile,BufRead *.rc,*.rch
! 	\ if expand("<afile>") !~ "/etc/Muttrc.d/" |
! 	\   setf rc |
! 	\ endif
  
  " MuPAD source
  au BufRead,BufNewFile *.mu			setf mupad
***************
*** 2286,2291 ****
--- 2287,2295 ----
  	\|endif
  au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
  
+ " Mutt setup files (must be before catch *.rc)
+ au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+ 
  " Mutt setup file
  au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
  au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
*** ../vim-8.2.3729/src/testdir/test_filetype.vim	2021-12-03 17:44:23.524803527 +0000
--- src/testdir/test_filetype.vim	2021-12-03 19:17:22.956381993 +0000
***************
*** 340,346 ****
      \ 'msql': ['file.msql'],
      \ 'mupad': ['file.mu'],
      \ 'mush': ['file.mush'],
!     \ 'muttrc': ['Muttngrc', 'Muttrc', '.muttngrc', '.muttngrc-file', '.muttrc', '.muttrc-file', '/.mutt/muttngrc', '/.mutt/muttngrc-file', '/.mutt/muttrc', '/.mutt/muttrc-file', '/.muttng/muttngrc', '/.muttng/muttngrc-file', '/.muttng/muttrc', '/.muttng/muttrc-file', '/etc/Muttrc.d/file', 'Muttngrc-file', 'Muttrc-file', 'any/.mutt/muttngrc', 'any/.mutt/muttngrc-file', 'any/.mutt/muttrc', 'any/.mutt/muttrc-file', 'any/.muttng/muttngrc', 'any/.muttng/muttngrc-file', 'any/.muttng/muttrc', 'any/.muttng/muttrc-file', 'any/etc/Muttrc.d/file', 'muttngrc', 'muttngrc-file', 'muttrc', 'muttrc-file'],
      \ 'mysql': ['file.mysql'],
      \ 'n1ql': ['file.n1ql', 'file.nql'],
      \ 'named': ['namedfile.conf', 'rndcfile.conf', 'named-file.conf', 'named.conf', 'rndc-file.conf', 'rndc-file.key', 'rndc.conf', 'rndc.key'],
--- 340,346 ----
      \ 'msql': ['file.msql'],
      \ 'mupad': ['file.mu'],
      \ 'mush': ['file.mush'],
!     \ 'muttrc': ['Muttngrc', 'Muttrc', '.muttngrc', '.muttngrc-file', '.muttrc', '.muttrc-file', '/.mutt/muttngrc', '/.mutt/muttngrc-file', '/.mutt/muttrc', '/.mutt/muttrc-file', '/.muttng/muttngrc', '/.muttng/muttngrc-file', '/.muttng/muttrc', '/.muttng/muttrc-file', '/etc/Muttrc.d/file', '/etc/Muttrc.d/file.rc', 'Muttngrc-file', 'Muttrc-file', 'any/.mutt/muttngrc', 'any/.mutt/muttngrc-file', 'any/.mutt/muttrc', 'any/.mutt/muttrc-file', 'any/.muttng/muttngrc', 'any/.muttng/muttngrc-file', 'any/.muttng/muttrc', 'any/.muttng/muttrc-file', 'any/etc/Muttrc.d/file', 'muttngrc', 'muttngrc-file', 'muttrc', 'muttrc-file'],
      \ 'mysql': ['file.mysql'],
      \ 'n1ql': ['file.n1ql', 'file.nql'],
      \ 'named': ['namedfile.conf', 'rndcfile.conf', 'named-file.conf', 'named.conf', 'rndc-file.conf', 'rndc-file.key', 'rndc.conf', 'rndc.key'],
***************
*** 503,509 ****
      \ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'],
      \ 'texinfo': ['file.texinfo', 'file.texi', 'file.txi'],
      \ 'texmf': ['texmf.cnf'],
!     \ 'text': ['file.text', 'README', 'LICENSE', 'COPYING', 'AUTHORS', '/usr/share/doc/bash-completion/AUTHORS', '/etc/apt/apt.conf.d/README'],
      \ 'tf': ['file.tf', '.tfrc', 'tfrc'],
      \ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
      \ 'tilde': ['file.t.html'],
--- 503,509 ----
      \ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'],
      \ 'texinfo': ['file.texinfo', 'file.texi', 'file.txi'],
      \ 'texmf': ['texmf.cnf'],
!     \ 'text': ['file.text', 'README', 'LICENSE', 'COPYING', 'AUTHORS', '/usr/share/doc/bash-completion/AUTHORS', '/etc/apt/apt.conf.d/README', '/etc/Muttrc.d/README'],
      \ 'tf': ['file.tf', '.tfrc', 'tfrc'],
      \ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
      \ 'tilde': ['file.t.html'],
*** ../vim-8.2.3729/src/version.c	2021-12-03 17:44:23.524803527 +0000
--- src/version.c	2021-12-03 19:21:32.871947744 +0000
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     3730,
  /**/

-- 
At some point in the project somebody will start whining about the need to
determine the project "requirements".  This involves interviewing people who
don't know what they want but, curiously, know exactly when they need it.
				(Scott Adams - The Dilbert principle)

 /// 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    ///