aboutsummaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2021-09-10 07:05:11 -0700
committerGitHub <noreply@github.com>2021-09-10 07:05:11 -0700
commit7b822d4b4b71ef0e9ed6a39ef50a5a2cbf8660c5 (patch)
tree1e58317059af6850e9f06289f33fbb3f61d8cf63 /runtime/filetype.vim
parentc7ccb26260e763cd5fde5f635da6889c736262fd (diff)
parent329047b3dbd09f7d77cdc07002c532c230e44ddb (diff)
downloadrneovim-7b822d4b4b71ef0e9ed6a39ef50a5a2cbf8660c5.tar.gz
rneovim-7b822d4b4b71ef0e9ed6a39ef50a5a2cbf8660c5.tar.bz2
rneovim-7b822d4b4b71ef0e9ed6a39ef50a5a2cbf8660c5.zip
Merge branch 'master' into histfile
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b3148bde25..c9eca870c2 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1025,7 +1025,7 @@ au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md setf markdown
" Mason
au BufNewFile,BufRead *.mason,*.mhtml,*.comp setf mason
-" Mathematica, Matlab, Murphi or Objective C
+" Mathematica, Matlab, Murphi, Objective C or Octave
au BufNewFile,BufRead *.m call dist#ft#FTm()
" Mathematica notebook
@@ -1171,6 +1171,9 @@ au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli
" Occam
au BufNewFile,BufRead *.occ setf occam
+" Octave
+au BufNewFile,BufRead octave.conf,.octaverc,octaverc setf octave
+
" Omnimark
au BufNewFile,BufRead *.xom,*.xin setf omnimark