patch 9.0.0932: Oblivion files are not recognized

Problem:    Oblivion files are not recognized.
Solution:   Recognize Oblivion files and alike as "obse". (closes #11540)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 57f4e243154571f1fa91aa60176d08fefebf3c34..a990c8d403a6247edd93ee64e1338f3414cb0dac 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1343,6 +1343,9 @@ au BufNewFile,BufRead *.nse                       setf lua
 " NSIS
 au BufNewFile,BufRead *.nsi,*.nsh              setf nsis
 
+" Oblivion Language and Oblivion Script Extender
+au BufNewFile,BufRead *.obl,*.obse,*.oblivion,*.obscript  setf obse
+
 " OCaml
 au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo setf ocaml
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 542a2a61d9c0003c11250985388ebfd3fb7a46cc..c7c494aaa5eeb2bbe45079c859ef413e06ce5329 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -395,6 +395,7 @@ let s:filename_checks = {
     \ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],
     \ 'nsis': ['file.nsi', 'file.nsh'],
     \ 'obj': ['file.obj'],
+    \ 'obse': ['file.obl', 'file.obse', 'file.oblivion', 'file.obscript'],
     \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit', 'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'],
     \ 'occam': ['file.occ'],
     \ 'octave': ['octaverc', '.octaverc', 'octave.conf'],

diff --git a/src/version.c b/src/version.c
index 98395531019d92b6b55725212321a3fe1191fd11..cdc62fc087ae9c3ce813dd64d14319aa5486c8f5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    932,
 /**/
     931,
 /**/