$OpenBSD: patch-runtime_filetype_vim,v 1.8 2015/07/08 16:36:41 sthen Exp $
--- runtime/filetype.vim.orig	Sat Jul  4 14:05:14 2015
+++ runtime/filetype.vim	Wed Jul  8 16:20:17 2015
@@ -71,6 +71,14 @@ func! s:Check_inp()
   endif
 endfunc
 
+func! s:Check_module()
+  if getline(1) =~ '^<?php'
+    setf php
+  else
+    setf virata
+  endif
+endfunc
+
 " A-A-P recipe
 au BufNewFile,BufRead *.aap			setf aap
 
@@ -624,7 +632,7 @@ au BufNewFile,BufRead dict.conf,.dictrc		setf dictconf
 au BufNewFile,BufRead dictd.conf		setf dictdconf
 
 " Diff files
-au BufNewFile,BufRead *.diff,*.rej,*.patch	setf diff
+au BufNewFile,BufRead *.diff,*.rej,*.patch,patch-*	setf diff
 
 " Dircolors
 au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS	setf dircolors
@@ -1135,7 +1143,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
 au BufNewFile,BufRead .mailcap,mailcap		setf mailcap
 
 " Makefile
-au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp setf make
+au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp,Makefile.inc setf make
 
 " MakeIndex
 au BufNewFile,BufRead *.ist,*.mst		setf ist
@@ -2313,12 +2321,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc	setf vim
 au BufNewFile,BufRead .viminfo,_viminfo		setf viminfo
 
 " Virata Config Script File or Drupal module
-au BufRead,BufNewFile *.hw,*.module,*.pkg
+au BufRead,BufNewFile *.hw,*.pkg
 	\ if getline(1) =~ '<?php' |
 	\   setf php |
 	\ else |
 	\   setf virata |
 	\ endif
+
+au BufRead,BufNewFile *.module			call s:Check_module()
 
 " Visual Basic (also uses *.bas) or FORM
 au BufNewFile,BufRead *.frm			call s:FTVB("form")
