diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-04-20 09:50:32 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2022-04-20 09:52:31 +0200 |
| commit | 63eb7e865b3c702d09bfa475587f646722996a56 (patch) | |
| tree | a6bac441f3c32470c8b365c2de4b9ef9bd502029 | |
| parent | d40b2afda8256be4dd91c58ccbb6220a2ca5490f (diff) | |
| download | rneovim-63eb7e865b3c702d09bfa475587f646722996a56.tar.gz rneovim-63eb7e865b3c702d09bfa475587f646722996a56.tar.bz2 rneovim-63eb7e865b3c702d09bfa475587f646722996a56.zip | |
vim-patch:8.2.4793: recognizing Maxima filetype even though it might be another
Problem: Recognizing Maxima filetype even though it might be another.
Solution: Remove *.mc and *.dem patterns from Maxima files
https://github.com/vim/vim/commit/928a13135629fa8e73796760077b1b877918a080
| -rw-r--r-- | runtime/filetype.vim | 12 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 978812795d..e72d6fc0c0 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -151,18 +151,21 @@ au BufNewFile,BufRead *.asp \ setf aspvbs | \ endif -" Grub (must be before catch *.lst) +" 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 -au BufNewFile,BufRead *.mc,*.demo,*.dem,*.dm{1,2,3,t},*.wxm,maxima-init.mac setf maxima +" 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() -" Macro (VAX) +" Assembly - Macro (VAX) au BufNewFile,BufRead *.mar setf vmasm " Atlas @@ -1678,7 +1681,8 @@ au BufNewFile,BufRead *.siv,*.sieve setf sieve " Sendmail au BufNewFile,BufRead sendmail.cf setf sm -" Sendmail .mc files are actually m4. Could also be MS Message text file. +" Sendmail .mc files are actually m4. Could also be MS Message text file or +" Maxima. au BufNewFile,BufRead *.mc call dist#ft#McSetf() " Services diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index ac36210b23..d575869377 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -389,6 +389,12 @@ local extension = { mason = "mason", master = "master", mas = "master", + demo = "maxima", + dm1 = "maxima", + dm2 = "maxima", + dm3 = "maxima", + dmt = "maxima", + wxm = "maxima", mel = "mel", mf = "mf", mgl = "mgl", @@ -1013,6 +1019,7 @@ local filename = { [".mailcap"] = "mailcap", ["/etc/man.conf"] = "manconf", ["man.config"] = "manconf", + ["maxima-init.mac"] = "maxima", ["meson.build"] = "meson", ["meson_options.txt"] = "meson", ["/etc/conf.modules"] = "modconf", diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index b64566b926..7a52d0a044 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -337,7 +337,7 @@ let s:filename_checks = { \ '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', + \ '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'], |