To: vim_dev@googlegroups.com
Subject: Patch 8.2.4793
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.4793
Problem:    Recognizing Maxima filetype even though it might be another.
Solution:   Remove *.mc and *.dem patterns from Maxima files
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.4792/runtime/filetype.vim	2022-04-19 15:29:53.609940094 +0100
--- runtime/filetype.vim	2022-04-19 19:32:41.337757677 +0100
***************
*** 155,172 ****
  	\   setf aspvbs |
  	\ endif
  
! " Grub (must be before catch *.lst)
  au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
  
  " Maxima, see:
  " https://maxima.sourceforge.io/docs/manual/maxima_71.html#file_005ftype_005fmaxima
! au BufNewFile,BufRead *.mc,*.demo,*.dem,*.dm{1,2,3,t},*.wxm,maxima-init.mac setf maxima
  
  " Assembly (all kinds)
  " *.lst is not pure assembly, it has two extra columns (address, byte codes)
  au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
  
! " Macro (VAX)
  au BufNewFile,BufRead *.mar			setf vmasm
  
  " Atlas
--- 155,175 ----
  	\   setf aspvbs |
  	\ endif
  
! " Grub (must be before pattern *.lst)
  au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
  
  " Maxima, see:
  " https://maxima.sourceforge.io/docs/manual/maxima_71.html#file_005ftype_005fmaxima
! " Must be before the pattern *.mac.
! " *.dem omitted - also used by gnuplot demos
! " *.mc omitted - used by dist#ft#McSetf()
! au BufNewFile,BufRead *.demo,*.dm{1,2,3,t},*.wxm,maxima-init.mac setf maxima
  
  " Assembly (all kinds)
  " *.lst is not pure assembly, it has two extra columns (address, byte codes)
  au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
  
! " Assembly - Macro (VAX)
  au BufNewFile,BufRead *.mar			setf vmasm
  
  " Atlas
***************
*** 1682,1688 ****
  " Sendmail
  au BufNewFile,BufRead sendmail.cf		setf sm
  
! " Sendmail .mc files are actually m4.  Could also be MS Message text file.
  au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
  
  " Services
--- 1685,1692 ----
  " Sendmail
  au BufNewFile,BufRead sendmail.cf		setf sm
  
! " Sendmail .mc files are actually m4.  Could also be MS Message text file or
! " Maxima.
  au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
  
  " Services
*** ../vim-8.2.4792/src/testdir/test_filetype.vim	2022-04-19 15:29:53.609940094 +0100
--- src/testdir/test_filetype.vim	2022-04-19 19:31:10.085803595 +0100
***************
*** 338,344 ****
      \ 'markdown': ['file.markdown', 'file.mdown', 'file.mkd', 'file.mkdn', 'file.mdwn', 'file.md'],
      \ 'mason': ['file.mason', 'file.mhtml', 'file.comp'],
      \ 'master': ['file.mas', 'file.master'],
!     \ 'maxima': ['file.mc', 'file.demo', 'file.dem', 'file.dmt', 'file.dm1', 'file.dm2', 'file.dm3',
      \            'file.wxm', 'maxima-init.mac'],
      \ 'mel': ['file.mel'],
      \ 'meson': ['meson.build', 'meson_options.txt'],
--- 338,344 ----
      \ 'markdown': ['file.markdown', 'file.mdown', 'file.mkd', 'file.mkdn', 'file.mdwn', 'file.md'],
      \ 'mason': ['file.mason', 'file.mhtml', 'file.comp'],
      \ 'master': ['file.mas', 'file.master'],
!     \ 'maxima': ['file.demo', 'file.dmt', 'file.dm1', 'file.dm2', 'file.dm3',
      \            'file.wxm', 'maxima-init.mac'],
      \ 'mel': ['file.mel'],
      \ 'meson': ['meson.build', 'meson_options.txt'],
*** ../vim-8.2.4792/src/version.c	2022-04-19 18:28:41.399860394 +0100
--- src/version.c	2022-04-19 19:33:55.921719721 +0100
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     4793,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
13. Go to a poetry recital and ask why the poems don't rhyme.

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