patch 8.2.2769: Modula-3 config files are not recognized

Problem:    Modula-3 config files are not recognized.
Solution:   Add filetype patterns. (Doug Kearns)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c4e028a5e9f3d1bcd8d33fc895cb3c3e9580ba84..43a5c2e7ffc74efa6ef1b1bc4bf25ca790d6503a 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -417,6 +417,10 @@ endif
 " Lynx config files
 au BufNewFile,BufRead lynx.cfg                 setf lynx
 
+" Modula-3 configuration language (must be before *.cfg and *makefile)
+au BufNewFile,BufRead *.quake,cm3.cfg          setf m3quake
+au BufNewFile,BufRead m3makefile,m3overrides   setf m3build
+
 " Quake
 au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg     setf quake
 au BufNewFile,BufRead *quake[1-3]/*.cfg                        setf quake
@@ -1045,10 +1049,10 @@ au BufNewFile,BufRead *.mod
        \   setf modsim3 |
        \ endif
 
-" Modula 2  (.md removed in favor of Markdown)
+" Modula-2  (.md removed in favor of Markdown)
 au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi    setf modula2
 
-" Modula 3 (.m3, .i3, .mg, .ig)
+" Modula-3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]               setf modula3
 
 " Monk

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 64c2595c2f104b9822489420378768d8bfa5de3e..f8e8b5d2389ebf8dfa1195a1acfbab3a883e20cf 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -290,6 +290,8 @@ let s:filename_checks = {
     \ 'lss': ['file.lss'],
     \ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
     \ 'lynx': ['lynx.cfg'],
+    \ 'm3build': ['m3makefile', 'm3overrides'],
+    \ 'm3quake': ['file.quake', 'cm3.cfg'],
     \ 'm4': ['file.at'],
     \ 'mail': ['snd.123', '.letter', '.letter.123', '.followup', '.article', '.article.123', 'pico.123', 'mutt-xx-xxx', 'muttng-xx-xxx', 'ae123.txt', 'file.eml', 'reportbug-file'],
     \ 'mailaliases': ['/etc/mail/aliases', '/etc/aliases', 'any/etc/aliases', 'any/etc/mail/aliases'],

diff --git a/src/version.c b/src/version.c
index fff7e69b72070ae662bff9dd9ff17c9b7457a724..8c558b20e9e87be456675dbb7cfaf784e0817d2d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2769,
 /**/
     2768,
 /**/