patch 8.2.5015: Hoon and Moonscript files are not recognized

Problem:    Hoon and Moonscript files are not recognized.
Solution:   Add filetype patterns. (Goc Dundar, closes #10478)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9994f8aac036bcc2dff6f7ea850ede6771a12385..da68ff4f721428a723b8b4f7e3a883824ccf6515 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -409,7 +409,7 @@ au BufNewFile,BufRead *.cu,*.cuh            setf cuda
 
 " Dockerfile; Podman uses the same syntax with name Containerfile
 " Also see Dockerfile.* below.
-au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile    setf dockerfile
+au BufNewFile,BufRead Containerfile,Dockerfile,dockerfile,*.[dD]ockerfile      setf dockerfile
 
 " WildPackets EtherPeek Decoder
 au BufNewFile,BufRead *.dcd                    setf dcd
@@ -819,6 +819,9 @@ au BufNewFile,BufRead *.hjson                       setf hjson
 " Hollywood
 au BufRead,BufNewFile *.hws                    setf hollywood
 
+" Hoon
+au BufRead,BufNewFile *.hoon                   setf hoon
+
 " Tilde (must be before HTML)
 au BufNewFile,BufRead *.t.html                 setf tilde
 
@@ -1172,6 +1175,9 @@ au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc    setf monk
 " MOO
 au BufNewFile,BufRead *.moo                    setf moo
 
+" Moonscript
+au BufNewFile,BufRead *.moon                   setf moonscript
+
 " Modconf
 au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d0837fde0de315f6087b4a7204a09b64f781ee4d..81ad0a6ec9c7bb12ae581fb4d60179af136f85a3 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -151,7 +151,7 @@ let s:filename_checks = {
     \ 'diff': ['file.diff', 'file.rej'],
     \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS', 'any/etc/DIR_COLORS'],
     \ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
-    \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
+    \ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
     \ 'dosbatch': ['file.bat'],
     \ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap'],
     \ 'dot': ['file.dot', 'file.gv'],
@@ -245,6 +245,7 @@ let s:filename_checks = {
     \ 'hjson': ['file.hjson'],
     \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
     \ 'hollywood': ['file.hws'],
+    \ 'hoon': ['file.hoon'],
     \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
     \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
     \ 'html': ['file.html', 'file.htm', 'file.cshtml'],
@@ -354,6 +355,7 @@ let s:filename_checks = {
     \ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'],
     \ 'monk': ['file.isc', 'file.monk', 'file.ssc', 'file.tsc'],
     \ 'moo': ['file.moo'],
+    \ 'moonscript': ['file.moon'],
     \ 'mp': ['file.mp'],
     \ 'mplayerconf': ['mplayer.conf', '/.mplayer/config', 'any/.mplayer/config'],
     \ 'mrxvtrc': ['mrxvtrc', '.mrxvtrc'],

diff --git a/src/version.c b/src/version.c
index a4af508a627fa8468a3e2753aefc22f2aad89bb6..4682108ff8e62f9738999a6dfc461da16bfe8271 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5015,
 /**/
     5014,
 /**/