2 files changed, 14 insertions, 4 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 6c15c29b53..2958f45d0a 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -147,13 +147,19 @@ export def FTcls()
   endif
 
   var line1 = getline(1)
-
-  if line1 =~ '^\v%(\%|\\)'
-    setf tex
-  elseif line1[0] == '#' && line1 =~ 'rexx'
+  if line1 =~ '^#!.*\<\%(rexx\|regina\)\>'
     setf rexx
+    return
   elseif line1 == 'VERSION 1.0 CLASS'
     setf vb
+    return
+  endif
+
+  var nonblank1 = getline(nextnonblank(1))
+  if nonblank1 =~ '^\v%(\%|\\)'
+    setf tex
+  elseif nonblank1 =~ '^\s*\%(/\*\|::\w\)'
+    setf rexx
   else
     setf st
   endif
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index 6163003aa4..fca5dcdbe6 100644
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -213,6 +213,10 @@ export def Exe2filetype(name: string, line1: string): string
   elseif name =~ '^crystal\>'
     return 'crystal'
 
+    # Rexx
+  elseif name =~ '^\%(rexx\|regina\)\>'
+    return 'rexx'
+
   endif
 
   return ''